From 42abb28b99a02f9580f4676ce5c315628e5bcd24 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 4 Jan 2016 16:54:38 +0100 Subject: [PATCH] BUG-865: deprecate pre-Beryllium parser elements This deprecates YangContextParser (in favor of the repository APIs) and implementation elements of the old parser. These are scheduled for removal in Boron. Change-Id: I4ec68576af0a7909a3d8705664d901a62ffcd7a0 Signed-off-by: Robert Varga --- .../model/parser/api/YangContextParser.java | 9 +-- .../api/AugmentationSchemaBuilder.java | 3 + .../api/AugmentationTargetBuilder.java | 3 + .../yang/parser/builder/api/Builder.java | 3 + .../builder/api/ConstraintsBuilder.java | 4 ++ .../builder/api/DataNodeContainerBuilder.java | 3 + .../builder/api/DataSchemaNodeBuilder.java | 3 + .../builder/api/DocumentedNodeBuilder.java | 4 +- .../parser/builder/api/ExtensionBuilder.java | 2 + .../parser/builder/api/GroupingBuilder.java | 3 + .../parser/builder/api/GroupingMember.java | 3 + .../parser/builder/api/RefineBuilder.java | 3 +- .../parser/builder/api/SchemaNodeBuilder.java | 3 + .../parser/builder/api/TypeAwareBuilder.java | 3 + .../builder/api/TypeDefinitionBuilder.java | 3 + .../builder/api/UnknownSchemaNodeBuilder.java | 4 ++ .../parser/builder/api/UsesNodeBuilder.java | 3 + .../parser/builder/impl/AnyXmlBuilder.java | 4 ++ .../builder/impl/AnyXmlSchemaNodeImpl.java | 5 ++ .../impl/AugmentationSchemaBuilderImpl.java | 6 +- .../builder/impl/AugmentationSchemaImpl.java | 5 +- .../parser/builder/impl/BuilderUtils.java | 4 ++ .../parser/builder/impl/ChoiceBuilder.java | 7 ++- .../builder/impl/ChoiceCaseBuilder.java | 4 ++ .../builder/impl/ChoiceCaseNodeImpl.java | 4 ++ .../builder/impl/ChoiceSchemaNodeImpl.java | 4 ++ .../builder/impl/ConstraintsBuilderImpl.java | 4 ++ .../impl/ContainerSchemaNodeBuilder.java | 4 ++ .../builder/impl/ContainerSchemaNodeImpl.java | 4 ++ .../yang/parser/builder/impl/CopyUtils.java | 4 ++ .../parser/builder/impl/DeviationBuilder.java | 6 +- .../builder/impl/ExtensionBuilderImpl.java | 4 ++ .../builder/impl/ExtensionDefinitionImpl.java | 4 ++ .../parser/builder/impl/FeatureBuilder.java | 4 ++ .../builder/impl/GroupingBuilderImpl.java | 4 ++ .../builder/impl/GroupingDefinitionImpl.java | 7 ++- .../parser/builder/impl/GroupingUtils.java | 4 ++ .../impl/IdentitySchemaNodeBuilder.java | 4 ++ .../builder/impl/IdentitySchemaNodeImpl.java | 4 ++ .../builder/impl/IdentityrefTypeBuilder.java | 3 + .../impl/LeafListSchemaNodeBuilder.java | 4 ++ .../builder/impl/LeafListSchemaNodeImpl.java | 4 ++ .../builder/impl/LeafSchemaNodeBuilder.java | 4 ++ .../builder/impl/LeafSchemaNodeImpl.java | 4 ++ .../builder/impl/ListSchemaNodeBuilder.java | 4 ++ .../builder/impl/ListSchemaNodeImpl.java | 4 ++ .../parser/builder/impl/ModuleBuilder.java | 3 + .../builder/impl/ModuleIdentifierImpl.java | 3 + .../yang/parser/builder/impl/ModuleImpl.java | 5 +- .../builder/impl/NotificationBuilder.java | 4 ++ .../impl/NotificationDefinitionImpl.java | 7 ++- .../parser/builder/impl/RefineHolderImpl.java | 4 ++ .../yang/parser/builder/impl/RefineUtils.java | 3 + .../builder/impl/RpcDefinitionBuilder.java | 4 ++ .../builder/impl/RpcDefinitionImpl.java | 4 ++ .../impl/TypeDefinitionBuilderImpl.java | 4 ++ .../yang/parser/builder/impl/TypeUtils.java | 6 +- .../parser/builder/impl/UnionTypeBuilder.java | 5 +- .../impl/UnknownSchemaNodeBuilderImpl.java | 8 ++- .../builder/impl/UnknownSchemaNodeImpl.java | 4 ++ .../builder/impl/UsesNodeBuilderImpl.java | 4 ++ .../parser/builder/impl/UsesNodeImpl.java | 4 ++ .../parser/builder/util/AbstractBuilder.java | 2 + .../AbstractDocumentedDataNodeContainer.java | 6 +- ...actDocumentedDataNodeContainerBuilder.java | 3 + .../builder/util/AbstractDocumentedNode.java | 4 ++ .../util/AbstractDocumentedNodeBuilder.java | 4 ++ .../util/AbstractSchemaNodeBuilder.java | 7 ++- .../util/AbstractTypeAwareBuilder.java | 9 ++- .../yang/parser/builder/util/Comparators.java | 8 ++- .../yang/parser/impl/GroupingSort.java | 4 ++ .../yang/parser/impl/ParserListenerUtils.java | 57 ++++++++++++++++-- .../yang/parser/impl/SchemaPathStack.java | 6 +- .../yang/parser/impl/YangParserImpl.java | 4 ++ .../parser/impl/YangParserListenerImpl.java | 5 +- .../parser/util/ModuleDependencySort.java | 46 ++------------- .../parser/util/ModuleOrModuleBuilder.java | 59 +++++++++++++++++++ .../yang/parser/util/TypeConstraints.java | 3 + .../builder/impl/AbstractBuilderTest.java | 5 +- .../parser/builder/impl/BuilderUtilsTest.java | 8 +-- .../parser/builder/impl/CopyUtilsTest.java | 3 + .../impl/LeafListSchemaNodeBuilderTest.java | 11 +++- .../builder/impl/ModuleBuilderTest.java | 3 + .../parser/builder/impl/RefineUtilsTest.java | 3 + .../impl/RpcDefinitionBuilderTest.java | 3 + .../impl/TypeDefinitionBuilderImplTest.java | 11 +++- .../AugmentationSchemaBuilderImplTest.java | 5 +- .../yang/parser/util/RefineHolderTest.java | 4 ++ .../AugmentationSchemaBuilderImplTest.java | 5 +- 89 files changed, 456 insertions(+), 90 deletions(-) create mode 100644 yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleOrModuleBuilder.java diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangContextParser.java b/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangContextParser.java index c35a81ac9c..7c1b4dcb27 100644 --- a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangContextParser.java +++ b/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangContextParser.java @@ -7,18 +7,19 @@ */ package org.opendaylight.yangtools.yang.model.parser.api; +import com.google.common.io.ByteSource; import java.io.File; import java.io.IOException; import java.util.Collection; - import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import com.google.common.io.ByteSource; - /** - * Parse yang models and convert data to SchemaContext. + * Parse YANG models and convert data to SchemaContext. * + * @deprecated Use {@link org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory} and related classes + * instead. */ +@Deprecated public interface YangContextParser extends YangModelParser { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java index 58beef0e87..c6dcc41f55 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java @@ -12,7 +12,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; /** * Builder for {@link AugmentationSchema}, which represents 'augment' statement. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public interface AugmentationSchemaBuilder extends DataNodeContainerBuilder,DocumentedNodeBuilder { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java index a58ef41a0e..79133f7697 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java @@ -9,7 +9,10 @@ package org.opendaylight.yangtools.yang.parser.builder.api; /** * Interface for builders of those nodes, which can be augmentation targets. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public interface AugmentationTargetBuilder { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java index 76d10b69ed..3e136562f6 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java @@ -12,7 +12,10 @@ import org.opendaylight.yangtools.concepts.Mutable; /** * Parent interface for all builder interfaces. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public interface Builder extends Mutable { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/ConstraintsBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/ConstraintsBuilder.java index 794905dfad..4d1cd8961b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/ConstraintsBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/ConstraintsBuilder.java @@ -12,6 +12,10 @@ import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; import org.opendaylight.yangtools.yang.model.api.MustDefinition; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public interface ConstraintsBuilder extends Builder { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java index f72afed490..fa0693901b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java @@ -21,7 +21,10 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; * Common builder for for all YANG {@link DataNodeContainer} * augment, case, container, * grouping, list, module, notification. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public interface DataNodeContainerBuilder extends Builder { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java index fe230e898f..cf0ed93f53 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java @@ -12,7 +12,10 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; /** * Interface for all yang data-schema nodes [anyxml, case, container, grouping, * list, module, notification]. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public interface DataSchemaNodeBuilder extends SchemaNodeBuilder, GroupingMember { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DocumentedNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DocumentedNodeBuilder.java index 72a3c510ed..804f7f8beb 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DocumentedNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DocumentedNodeBuilder.java @@ -12,7 +12,9 @@ import org.opendaylight.yangtools.yang.model.api.Status; /** * Mixin-style builder interfac for nodes, which may have documentation attached. * - **/ + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public interface DocumentedNodeBuilder { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/ExtensionBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/ExtensionBuilder.java index 45688a7e5d..e9cdbe12a5 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/ExtensionBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/ExtensionBuilder.java @@ -12,7 +12,9 @@ import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition; /** * Builder for extension statement. * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public interface ExtensionBuilder extends SchemaNodeBuilder { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java index f186dc3cf3..a82e0eedfc 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java @@ -13,7 +13,10 @@ import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; /** * Interface for builders of 'grouping' statement. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public interface GroupingBuilder extends DataNodeContainerBuilder, SchemaNodeBuilder, GroupingMember { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java index b6137fd036..cfdc273c67 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java @@ -10,7 +10,10 @@ package org.opendaylight.yangtools.yang.parser.builder.api; /** * Marker interface for nodes which can be defined in grouping statement. * [anyxml, choice, container, grouping, leaf, leaf-list, list, typedef, uses] + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public interface GroupingMember extends Builder { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/RefineBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/RefineBuilder.java index fc96482d65..f36eb7fbe2 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/RefineBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/RefineBuilder.java @@ -16,8 +16,9 @@ import org.opendaylight.yangtools.yang.model.api.MustDefinition; * Represents a local change to node introduced by uses statement * e.g. change in documentation, configuration or properties. * - * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public interface RefineBuilder extends DocumentedNodeBuilder { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java index f81813c454..a2d3a51d9f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java @@ -13,7 +13,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; /** * Builder for {@link SchemaNode}. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public interface SchemaNodeBuilder extends DocumentedNodeBuilder, Builder { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java index 72a12c5860..90c7adc1b9 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java @@ -14,7 +14,10 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; /** * Builder for nodes, which can have 'type' statement must implement this * interface. [typedef, type, leaf, leaf-list, deviate] + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public interface TypeAwareBuilder extends Builder { QName getTypeQName(); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java index dff64b38cc..e6b6499f91 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java @@ -16,7 +16,10 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; /** * Interface for builders of 'typedef' statement. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public interface TypeDefinitionBuilder extends TypeAwareBuilder, SchemaNodeBuilder, GroupingMember { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UnknownSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UnknownSchemaNodeBuilder.java index ca3d2ffbdd..f019bd6315 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UnknownSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UnknownSchemaNodeBuilder.java @@ -12,6 +12,10 @@ import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public interface UnknownSchemaNodeBuilder extends SchemaNodeBuilder, DocumentedNodeBuilder { @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java index 5b17b1a9df..aedeef3ccb 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java @@ -15,7 +15,10 @@ import org.opendaylight.yangtools.yang.model.api.UsesNode; /** * Builder for 'uses' statement. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public interface UsesNodeBuilder extends GroupingMember { /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java index 2a9e4cde7a..feb4629825 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java @@ -19,6 +19,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractSchemaNodeBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements DataSchemaNodeBuilder { private AnyXmlSchemaNodeImpl instance; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlSchemaNodeImpl.java index ab4a18b45a..fe0e4b1f0c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlSchemaNodeImpl.java @@ -19,6 +19,11 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +/** + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class AnyXmlSchemaNodeImpl implements AnyXmlSchemaNode, DerivableSchemaNode { private final QName qname; private final SchemaPath path; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java index 46f809b31b..c2e17c9b69 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java @@ -18,6 +18,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.Builder; import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainerBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class AugmentationSchemaBuilderImpl extends AbstractDocumentedDataNodeContainerBuilder implements AugmentationSchemaBuilder { private final int order; private AugmentationSchemaImpl instance; @@ -107,7 +111,7 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDocumentedDataN * In such case, augmentation is skipped and AugmentationSchema is not built. */ @Override - public void setUnsupportedTarget(boolean unsupportedTarget) { + public void setUnsupportedTarget(final boolean unsupportedTarget) { this.unsupportedTarget = unsupportedTarget; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaImpl.java index 5386d444db..bada88e786 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaImpl.java @@ -8,7 +8,6 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import static com.google.common.base.Preconditions.checkNotNull; - import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.net.URI; @@ -24,6 +23,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainer; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class AugmentationSchemaImpl extends AbstractDocumentedDataNodeContainer implements AugmentationSchema, NamespaceRevisionAware, Comparable { private final int order; private final SchemaPath targetPath; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java index 3c999263c2..792db8d9c8 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java @@ -78,6 +78,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class BuilderUtils { private static final Logger LOG = LoggerFactory.getLogger(BuilderUtils.class); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java index 5ec23d1000..03c1341184 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java @@ -32,8 +32,11 @@ import org.opendaylight.yangtools.yang.parser.builder.util.AbstractSchemaNodeBui import org.opendaylight.yangtools.yang.parser.builder.util.Comparators; import org.opendaylight.yangtools.yang.parser.util.YangParseException; -public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements DataSchemaNodeBuilder, -AugmentationTargetBuilder { +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated +public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements DataSchemaNodeBuilder, AugmentationTargetBuilder { private ChoiceSchemaNodeImpl instance; // DataSchemaNode args diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java index b6c6fcf6d3..e470d15b86 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java @@ -28,6 +28,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuild import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainerBuilder; import org.opendaylight.yangtools.yang.parser.util.YangParseException; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class ChoiceCaseBuilder extends AbstractDocumentedDataNodeContainerBuilder implements DataSchemaNodeBuilder, AugmentationTargetBuilder { private ChoiceCaseNodeImpl instance; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseNodeImpl.java index ff96faf9bd..c1b06bf467 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseNodeImpl.java @@ -23,6 +23,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainer; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class ChoiceCaseNodeImpl extends AbstractDocumentedDataNodeContainer implements ChoiceCaseNode, DerivableSchemaNode { private final QName qname; private final SchemaPath path; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceSchemaNodeImpl.java index 6a4a0a81d2..7e15bf81de 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceSchemaNodeImpl.java @@ -24,6 +24,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class ChoiceSchemaNodeImpl implements ChoiceSchemaNode, DerivableSchemaNode { private final QName qname; private final SchemaPath path; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilderImpl.java index 8db7ed9311..0ae87ee010 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilderImpl.java @@ -18,6 +18,10 @@ import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; import org.opendaylight.yangtools.yang.model.util.RevisionAwareXPathImpl; import org.opendaylight.yangtools.yang.parser.builder.api.ConstraintsBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class ConstraintsBuilderImpl implements ConstraintsBuilder { private static final ConstraintDefinitionImpl EMPTY_CONSTRAINT = new ConstraintDefinitionImpl(); private static final ConstraintDefinitionImpl EMPTY_MANDATORY_CONSTRAINT; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java index 61b7dab27b..421d35ff72 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java @@ -25,6 +25,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainerBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class ContainerSchemaNodeBuilder extends AbstractDocumentedDataNodeContainerBuilder implements AugmentationTargetBuilder, DataSchemaNodeBuilder { private ContainerSchemaNodeImpl instance; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeImpl.java index fac9330d04..ba3b1f59f9 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeImpl.java @@ -23,6 +23,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainer; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class ContainerSchemaNodeImpl extends AbstractDocumentedDataNodeContainer implements ContainerSchemaNode, DerivableSchemaNode { private final QName qname; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/CopyUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/CopyUtils.java index 8f9ffa98b4..acb85f9a9a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/CopyUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/CopyUtils.java @@ -21,6 +21,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuild import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder; import org.opendaylight.yangtools.yang.parser.util.YangParseException; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class CopyUtils { private CopyUtils() { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java index 698e3e5897..4a89a959a7 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java @@ -18,6 +18,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuild import org.opendaylight.yangtools.yang.parser.builder.util.AbstractBuilder; import org.opendaylight.yangtools.yang.parser.util.YangParseException; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class DeviationBuilder extends AbstractBuilder { private DeviationImpl instance; private final SchemaPath targetPath; @@ -119,7 +123,7 @@ public final class DeviationBuilder extends AbstractBuilder { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilderImpl.java index 5cb7160103..c7e745b7ce 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilderImpl.java @@ -16,6 +16,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.ExtensionBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractSchemaNodeBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class ExtensionBuilderImpl extends AbstractSchemaNodeBuilder implements ExtensionBuilder { private ExtensionDefinitionImpl instance; private String argument; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionDefinitionImpl.java index 42ce62cdd8..a86306611e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionDefinitionImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionDefinitionImpl.java @@ -16,6 +16,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class ExtensionDefinitionImpl implements ExtensionDefinition { private final QName qname; String argument; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java index 0a6700af4d..00a8f36810 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java @@ -19,6 +19,10 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractSchemaNodeBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class FeatureBuilder extends AbstractSchemaNodeBuilder { private FeatureDefinitionImpl instance; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java index ce16624087..191e234e65 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java @@ -24,6 +24,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainerBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class GroupingBuilderImpl extends AbstractDocumentedDataNodeContainerBuilder implements GroupingBuilder { private GroupingDefinitionImpl instance; // SchemaNode args diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingDefinitionImpl.java index 6d296aa61b..8e07148c6e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingDefinitionImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingDefinitionImpl.java @@ -17,8 +17,11 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainer; -final class GroupingDefinitionImpl extends AbstractDocumentedDataNodeContainer implements -GroupingDefinition { +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated +final class GroupingDefinitionImpl extends AbstractDocumentedDataNodeContainer implements GroupingDefinition { private final QName qname; private final SchemaPath path; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingUtils.java index eb06329eaa..63058a6f31 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingUtils.java @@ -26,6 +26,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class GroupingUtils { private static final Logger LOG = LoggerFactory.getLogger(GroupingUtils.class); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java index 168c956ced..8c571dd8e2 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java @@ -17,6 +17,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractSchemaNodeBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class IdentitySchemaNodeBuilder extends AbstractSchemaNodeBuilder { private IdentitySchemaNodeImpl instance; private IdentitySchemaNode baseIdentity; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeImpl.java index 625d309595..67a5b784e6 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeImpl.java @@ -19,6 +19,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class IdentitySchemaNodeImpl implements IdentitySchemaNode { private final QName qname; private final SchemaPath path; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java index ca2982d84a..464e57abf9 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java @@ -26,7 +26,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; /** * Builder for YANG identityref type. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public final class IdentityrefTypeBuilder extends AbstractTypeAwareBuilder implements TypeDefinitionBuilder { private static final String NAME = "identityref"; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java index 937054ef90..3250ae8ad9 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java @@ -20,6 +20,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractTypeAwareBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class LeafListSchemaNodeBuilder extends AbstractTypeAwareBuilder implements DataSchemaNodeBuilder { private LeafListSchemaNodeImpl instance; private boolean userOrdered; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeImpl.java index 63d9141f3f..925ead2201 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeImpl.java @@ -20,6 +20,10 @@ import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class LeafListSchemaNodeImpl implements LeafListSchemaNode, DerivableSchemaNode { private final QName qname; private final SchemaPath path; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java index 5778e8a9cd..1d6fe18675 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java @@ -21,6 +21,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuild import org.opendaylight.yangtools.yang.parser.builder.util.AbstractTypeAwareBuilder; import org.opendaylight.yangtools.yang.parser.util.YangParseException; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class LeafSchemaNodeBuilder extends AbstractTypeAwareBuilder implements DataSchemaNodeBuilder { private LeafSchemaNodeImpl instance; private String defaultStr; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeImpl.java index e4406164f8..8dbff13942 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeImpl.java @@ -20,6 +20,10 @@ import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class LeafSchemaNodeImpl implements LeafSchemaNode, DerivableSchemaNode { private final QName qname; private final SchemaPath path; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java index d5eeba7e32..dbd0951cde 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java @@ -29,6 +29,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuild import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainerBuilder; import org.opendaylight.yangtools.yang.parser.util.YangParseException; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeContainerBuilder implements DataSchemaNodeBuilder, AugmentationTargetBuilder { private ListSchemaNodeImpl instance; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeImpl.java index 79ebe11b7e..b25980cc0c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeImpl.java @@ -23,6 +23,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainer; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class ListSchemaNodeImpl extends AbstractDocumentedDataNodeContainer implements ListSchemaNode, DerivableSchemaNode { private final QName qname; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java index 14ee3961e0..79e992028d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java @@ -61,7 +61,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; * Builder of Module object. If this module is dependent on external * module/modules, these dependencies must be resolved before module is built, * otherwise result may not be valid. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public class ModuleBuilder extends AbstractDocumentedDataNodeContainerBuilder implements DocumentedNodeBuilder { private static final QNameModule EMPTY_QNAME_MODULE = QNameModule.create(null, null).intern(); private static final String GROUPING_STR = "Grouping"; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleIdentifierImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleIdentifierImpl.java index ac939a0047..63608b3e7a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleIdentifierImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleIdentifierImpl.java @@ -18,7 +18,10 @@ import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier; * ModuleIdentifier that can be used for indexing/searching by name. * Name is only non-null attribute. * Equality check on namespace and revision is only triggered if they are non-null + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public class ModuleIdentifierImpl implements ModuleIdentifier { private final QNameModule qnameModule; private final String name; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java index 9b04c6875c..fa4a8ae25a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import static com.google.common.base.Preconditions.checkNotNull; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.net.URI; @@ -36,6 +35,10 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainer; import org.opendaylight.yangtools.yang.parser.builder.util.Comparators; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implements Module, Immutable { private final QNameModule qnameModule; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java index fb1b7af7c7..9edcef9f9a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java @@ -23,6 +23,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuild import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainerBuilder; import org.opendaylight.yangtools.yang.parser.util.YangParseException; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class NotificationBuilder extends AbstractDocumentedDataNodeContainerBuilder implements SchemaNodeBuilder, AugmentationTargetBuilder { private NotificationDefinitionImpl instance; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationDefinitionImpl.java index bcf82252b6..a12786f203 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationDefinitionImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationDefinitionImpl.java @@ -20,8 +20,11 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainer; -final class NotificationDefinitionImpl extends AbstractDocumentedDataNodeContainer implements -NotificationDefinition { +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated +final class NotificationDefinitionImpl extends AbstractDocumentedDataNodeContainer implements NotificationDefinition { private final QName qname; private final SchemaPath path; ImmutableSet augmentations; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineHolderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineHolderImpl.java index dc217958ce..2fe4395db6 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineHolderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineHolderImpl.java @@ -13,6 +13,10 @@ import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.parser.builder.api.RefineBuilder; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class RefineHolderImpl extends AbstractBuilder implements RefineBuilder { private final String targetPathString; private String defaultStr; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtils.java index e3f02b8dc2..d9d0c41384 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtils.java @@ -23,7 +23,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; /** * Utility class with helper methods to perform operations tied to refine * process. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public final class RefineUtils { private RefineUtils() { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java index a20cfb2dad..1835e841f5 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java @@ -26,6 +26,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuild import org.opendaylight.yangtools.yang.parser.builder.util.AbstractSchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.util.Comparators; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder { private RpcDefinitionImpl instance; private ContainerSchemaNodeBuilder inputBuilder; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionImpl.java index fe19f9e0ee..fa056f1985 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionImpl.java @@ -21,6 +21,10 @@ import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class RpcDefinitionImpl implements RpcDefinition { private final QName qname; private final SchemaPath path; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java index 42104ddecc..a131d9f9bc 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java @@ -26,6 +26,10 @@ import org.opendaylight.yangtools.yang.parser.builder.util.AbstractTypeAwareBuil import org.opendaylight.yangtools.yang.parser.builder.util.Comparators; import org.opendaylight.yangtools.yang.parser.util.YangParseException; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class TypeDefinitionBuilderImpl extends AbstractTypeAwareBuilder implements TypeDefinitionBuilder { private SchemaPath schemaPath; private List ranges = Collections.emptyList(); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeUtils.java index a02baead8d..a9c0816881 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeUtils.java @@ -8,7 +8,6 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import static org.opendaylight.yangtools.yang.parser.builder.impl.BuilderUtils.findBaseIdentity; - import java.net.URI; import java.util.Date; import java.util.Map; @@ -31,7 +30,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; /** * Utility class which contains helper methods for dealing with type operations. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public final class TypeUtils { private TypeUtils() { @@ -135,7 +137,7 @@ public final class TypeUtils { * name of type * @return type with given name if present in collection, null otherwise */ - private static TypeDefinitionBuilder findTypedefBuilderByName(Set types, String name) { + private static TypeDefinitionBuilder findTypedefBuilderByName(final Set types, final String name) { for (TypeDefinitionBuilder td : types) { if (td.getQName().getLocalName().equals(name)) { return td; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java index adb39dce78..cfb8cc9ede 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java @@ -29,7 +29,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; * TypeDefinition object (resolved type) or in form of TypeDefinitionBuilder. * When build is called, types in builder form will be built and add to resolved * types. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public final class UnionTypeBuilder extends AbstractTypeAwareBuilder implements TypeDefinitionBuilder { private static final SchemaPath SCHEMA_PATH = SchemaPath.create(true, BaseTypes.UNION_QNAME); private static final String NAME = "union"; @@ -39,7 +42,7 @@ public final class UnionTypeBuilder extends AbstractTypeAwareBuilder implements private UnionType instance; private boolean isBuilt; - private List baseTypesQNames = new ArrayList<>(); + private final List baseTypesQNames = new ArrayList<>(); public UnionTypeBuilder(final String moduleName, final int line) { super(moduleName, line, BaseTypes.UNION_QNAME); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilderImpl.java index c8c38b47cf..847a41548d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilderImpl.java @@ -20,8 +20,12 @@ import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuild import org.opendaylight.yangtools.yang.parser.builder.util.AbstractBuilder; import org.opendaylight.yangtools.yang.parser.builder.util.Comparators; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class UnknownSchemaNodeBuilderImpl extends AbstractBuilder implements UnknownSchemaNodeBuilder { - private QName qname; + private final QName qname; private SchemaPath schemaPath; private String description; private String reference; @@ -67,7 +71,7 @@ public final class UnknownSchemaNodeBuilderImpl extends AbstractBuilder implemen } @Override - public void setPath(SchemaPath schemaPath) { + public void setPath(final SchemaPath schemaPath) { this.schemaPath = schemaPath; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeImpl.java index 17079462ac..8e75abf703 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeImpl.java @@ -16,6 +16,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class UnknownSchemaNodeImpl implements UnknownSchemaNode { private final QName qname; private final SchemaPath path; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java index f5e0bb697a..6e4e290952 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java @@ -34,6 +34,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.util.AbstractBuilder; import org.opendaylight.yangtools.yang.parser.util.YangParseException; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNodeBuilder { private UsesNodeImpl instance; private DataNodeContainerBuilder parentBuilder; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeImpl.java index 4507c853e3..874b0d7add 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeImpl.java @@ -20,6 +20,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.UsesNode; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class UsesNodeImpl implements UsesNode { private final SchemaPath groupingPath; ImmutableSet augmentations; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractBuilder.java index 19033d19ad..ba38ddaa02 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractBuilder.java @@ -17,7 +17,9 @@ import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuild /** * Base helper implementation of Builders for Yang Model elements. * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public abstract class AbstractBuilder implements Builder { private final String moduleName; private final int line; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedDataNodeContainer.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedDataNodeContainer.java index 766b61fbce..67b74b7f16 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedDataNodeContainer.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedDataNodeContainer.java @@ -9,10 +9,8 @@ package org.opendaylight.yangtools.yang.parser.builder.util; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; - import java.util.Map; import java.util.Set; - import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -20,6 +18,10 @@ import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UsesNode; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public abstract class AbstractDocumentedDataNodeContainer extends AbstractDocumentedNode implements DataNodeContainer { private final Map childNodes; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedDataNodeContainerBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedDataNodeContainerBuilder.java index d7ca55b3b7..22b2a98a48 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedDataNodeContainerBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedDataNodeContainerBuilder.java @@ -32,7 +32,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; /** * Basic implementation of DataNodeContainerBuilder. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public abstract class AbstractDocumentedDataNodeContainerBuilder extends AbstractDocumentedNodeBuilder implements DataNodeContainerBuilder { protected final QName qname; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedNode.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedNode.java index 621b7185c6..d375aba5c4 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedNode.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedNode.java @@ -12,6 +12,10 @@ import com.google.common.base.Preconditions; import org.opendaylight.yangtools.yang.model.api.DocumentedNode; import org.opendaylight.yangtools.yang.model.api.Status; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public abstract class AbstractDocumentedNode implements DocumentedNode { private final String description; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedNodeBuilder.java index 27c46a2260..a7554b5052 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractDocumentedNodeBuilder.java @@ -12,6 +12,10 @@ import org.opendaylight.yangtools.yang.model.api.DocumentedNode; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.parser.builder.api.DocumentedNodeBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public abstract class AbstractDocumentedNodeBuilder extends AbstractBuilder implements DocumentedNodeBuilder{ private String description = null; private String reference = null; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractSchemaNodeBuilder.java index 3d45c4ee74..88cc73d8f5 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractSchemaNodeBuilder.java @@ -16,7 +16,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder; /** * Basic implementation of SchemaNodeBuilder. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public abstract class AbstractSchemaNodeBuilder extends AbstractBuilder implements SchemaNodeBuilder { protected final QName qname; protected SchemaPath schemaPath; @@ -70,7 +73,7 @@ public abstract class AbstractSchemaNodeBuilder extends AbstractBuilder implemen } @Override - public void setStatus(Status status) { + public void setStatus(final Status status) { this.status = Preconditions.checkNotNull(status, "status cannot be null"); } @@ -84,7 +87,7 @@ public abstract class AbstractSchemaNodeBuilder extends AbstractBuilder implemen } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractTypeAwareBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractTypeAwareBuilder.java index 14a22dada2..2687881cac 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractTypeAwareBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractTypeAwareBuilder.java @@ -14,7 +14,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder; /** * Basic implementation for TypeAwareBuilder builders. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public abstract class AbstractTypeAwareBuilder extends AbstractBuilder implements TypeAwareBuilder { protected QName qname; protected TypeDefinition type; @@ -43,13 +46,13 @@ public abstract class AbstractTypeAwareBuilder extends AbstractBuilder implement } @Override - public void setType(TypeDefinition type) { + public void setType(final TypeDefinition type) { this.type = type; this.typedef = null; } @Override - public void setTypedef(TypeDefinitionBuilder typedef) { + public void setTypedef(final TypeDefinitionBuilder typedef) { this.typedef = typedef; this.type = null; } @@ -60,7 +63,7 @@ public abstract class AbstractTypeAwareBuilder extends AbstractBuilder implement } @Override - public void setTypeQName(QName qname) { + public void setTypeQName(final QName qname) { this.baseTypeName = qname; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/Comparators.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/Comparators.java index 26f19e07d4..3b4576d7ac 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/Comparators.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/Comparators.java @@ -15,6 +15,10 @@ import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class Comparators { /** @@ -42,7 +46,7 @@ public final class Comparators { private static final class AugmentBuilderComparator implements Comparator { @Override - public int compare(AugmentationSchemaBuilder o1, AugmentationSchemaBuilder o2) { + public int compare(final AugmentationSchemaBuilder o1, final AugmentationSchemaBuilder o2) { int length1 = Iterables.size(o1.getTargetPath().getPathFromRoot()); int length2 = Iterables.size(o2.getTargetPath().getPathFromRoot()); return length1 - length2; @@ -51,7 +55,7 @@ public final class Comparators { private static final class AugmentComparator implements Comparator { @Override - public int compare(AugmentationSchema augSchema1, AugmentationSchema augSchema2) { + public int compare(final AugmentationSchema augSchema1, final AugmentationSchema augSchema2) { final Iterator thisIt = augSchema1.getTargetPath().getPathFromRoot().iterator(); final Iterator otherIt = augSchema2.getTargetPath().getPathFromRoot().iterator(); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/GroupingSort.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/GroupingSort.java index 6805d93440..4112d4f2ca 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/GroupingSort.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/GroupingSort.java @@ -27,6 +27,10 @@ import org.opendaylight.yangtools.yang.parser.util.NodeWrappedType; import org.opendaylight.yangtools.yang.parser.util.TopologicalSort; import org.opendaylight.yangtools.yang.parser.util.TopologicalSort.Node; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class GroupingSort { private GroupingSort() { throw new UnsupportedOperationException("Utility class should not be instantiated"); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java index eb2b65c0d2..fadb1a2353 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.parser.impl; import static com.google.common.base.Preconditions.checkState; - import com.google.common.base.CharMatcher; import com.google.common.base.Optional; import com.google.common.base.Splitter; @@ -437,7 +436,9 @@ public final class ParserListenerUtils { * context to parse * @param builder * builder to fill in with parsed statements + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ + @Deprecated public static void parseSchemaNodeArgs(final ParseTree ctx, final SchemaNodeBuilder builder) { for (int i = 0; i < ctx.getChildCount(); i++) { final ParseTree child = ctx.getChild(i); @@ -1003,7 +1004,7 @@ public final class ParserListenerUtils { return rawPattern; } - private static String fixUnknownScripts(String exMessage, String rawPattern) { + private static String fixUnknownScripts(final String exMessage, final String rawPattern) { StringBuilder result = new StringBuilder(rawPattern); Matcher matcher = BETWEEN_CURLY_BRACES_PATTERN.matcher(exMessage); if (matcher.find()) { @@ -1016,7 +1017,7 @@ public final class ParserListenerUtils { return result.toString(); } - private static String wrapPattern(String rawPattern) { + private static String wrapPattern(final String rawPattern) { final StringBuilder wrapPatternBuilder = new StringBuilder(rawPattern.length() + 2); wrapPatternBuilder.append('^'); wrapPatternBuilder.append(rawPattern); @@ -1235,7 +1236,9 @@ public final class ParserListenerUtils { * @param line * line in current module * @return config statement parsed from given context + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ + @Deprecated public static boolean getConfig(final ParseTree ctx, final Builder node, final String moduleName, final int line) { boolean result; // parse configuration statement @@ -1266,6 +1269,10 @@ public final class ParserListenerUtils { return result; } + /** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ + @Deprecated private static boolean getParentConfig(final Builder node) { Builder parent = node.getParent(); boolean config; @@ -1329,9 +1336,12 @@ public final class ParserListenerUtils { * current module qname * @param actualPath * actual path in model + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ - public static void parseUnknownTypeWithBody(Type_body_stmtsContext typeBody, TypeAwareBuilder parent, - QName prefixedQName, ModuleBuilder moduleBuilder, QName moduleQName, SchemaPath actualPath) { + @Deprecated + public static void parseUnknownTypeWithBody(final Type_body_stmtsContext typeBody, final TypeAwareBuilder parent, + final QName prefixedQName, final ModuleBuilder moduleBuilder, final QName moduleQName, final SchemaPath actualPath) { final int line = typeBody.getStart().getLine(); List rangeStatements = getRangeConstraints(typeBody, moduleBuilder.getName()); @@ -1376,7 +1386,10 @@ public final class ParserListenerUtils { * @param parent * parent builder * @return TypeDefinition object based on parsed values. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ + @Deprecated public static TypeDefinition parseTypeWithBody(final String typeName, final Type_body_stmtsContext typeBody, final SchemaPath actualPath, final QName moduleQName, final Builder parent) { @@ -1641,7 +1654,10 @@ public final class ParserListenerUtils { * context to parse * @param constraints * ConstraintsBuilder to fill + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ + @Deprecated public static void parseConstraints(final ParseTree ctx, final ConstraintsBuilder constraints) { for (int i = 0; i < ctx.getChildCount(); ++i) { final ParseTree childNode = ctx.getChild(i); @@ -1776,7 +1792,10 @@ public final class ParserListenerUtils { * @param moduleName * name of current module * @return RefineHolder object representing this refine statement + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ + @Deprecated public static RefineHolderImpl parseRefine(final Refine_stmtContext refineCtx, final String moduleName) { final String refineTarget = stringFromNode(refineCtx); final RefineHolderImpl refine = new RefineHolderImpl(moduleName, refineCtx.getStart().getLine(), refineTarget); @@ -1806,6 +1825,10 @@ public final class ParserListenerUtils { return refine; } + /** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ + @Deprecated private static void parseRefineDefault(final RefineHolderImpl refine, final ParseTree refineStmt) { for (int i = 0; i < refineStmt.getChildCount(); i++) { ParseTree refineArg = refineStmt.getChild(i); @@ -1822,6 +1845,10 @@ public final class ParserListenerUtils { } } + /** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ + @Deprecated private static RefineBuilder parseRefine(final RefineHolderImpl refine, final Refine_leaf_stmtsContext refineStmt) { for (int i = 0; i < refineStmt.getChildCount(); i++) { ParseTree refineArg = refineStmt.getChild(i); @@ -1845,6 +1872,10 @@ public final class ParserListenerUtils { return refine; } + /** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ + @Deprecated private static RefineBuilder parseRefine(final RefineBuilder refine, final Refine_container_stmtsContext refineStmt) { for (int i = 0; i < refineStmt.getChildCount(); i++) { ParseTree refineArg = refineStmt.getChild(i); @@ -1858,6 +1889,10 @@ public final class ParserListenerUtils { return refine; } + /** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ + @Deprecated private static RefineBuilder parseRefine(final RefineHolderImpl refine, final Refine_list_stmtsContext refineStmt) { for (int i = 0; i < refineStmt.getChildCount(); i++) { ParseTree refineArg = refineStmt.getChild(i); @@ -1875,6 +1910,10 @@ public final class ParserListenerUtils { return refine; } + /** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ + @Deprecated private static RefineBuilder parseRefine(final RefineHolderImpl refine, final Refine_leaf_list_stmtsContext refineStmt) { for (int i = 0; i < refineStmt.getChildCount(); i++) { ParseTree refineArg = refineStmt.getChild(i); @@ -1892,6 +1931,10 @@ public final class ParserListenerUtils { return refine; } + /** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ + @Deprecated private static RefineBuilder parseRefine(final RefineHolderImpl refine, final Refine_choice_stmtsContext refineStmt) { for (int i = 0; i < refineStmt.getChildCount(); i++) { ParseTree refineArg = refineStmt.getChild(i); @@ -1911,6 +1954,10 @@ public final class ParserListenerUtils { return refine; } + /** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ + @Deprecated private static RefineBuilder parseRefine(final RefineBuilder refine, final Refine_anyxml_stmtsContext refineStmt) { for (int i = 0; i < refineStmt.getChildCount(); i++) { ParseTree refineArg = refineStmt.getChild(i); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaPathStack.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaPathStack.java index 260bf7b6e0..15e97ea0ef 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaPathStack.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaPathStack.java @@ -8,13 +8,15 @@ package org.opendaylight.yangtools.yang.parser.impl; import com.google.common.base.Preconditions; - import java.util.Deque; import java.util.LinkedList; - import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated final class SchemaPathStack { private final Deque paths = new LinkedList<>(); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java index 1aafe20ae4..b25986d34d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java @@ -90,6 +90,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated @Immutable public final class YangParserImpl implements YangContextParser { private static final Logger LOG = LoggerFactory.getLogger(YangParserImpl.class); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java index 1254e2d5f7..ec5e1f1820 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java @@ -21,7 +21,6 @@ import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.pa import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.parseUserOrdered; import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.parseYinValue; import static org.opendaylight.yangtools.yang.parser.impl.ParserListenerUtils.stringFromNode; - import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.Iterables; @@ -103,6 +102,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public final class YangParserListenerImpl extends YangParserBaseListener { private static final Logger LOG = LoggerFactory.getLogger(YangParserListenerImpl.class); private static final Splitter SLASH_SPLITTER = Splitter.on('/').omitEmptyStrings(); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java index 837d71115f..c34a8f4218 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java @@ -8,15 +8,12 @@ package org.opendaylight.yangtools.yang.parser.util; import static java.util.Arrays.asList; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; -import com.google.common.base.Optional; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import java.net.URI; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -84,11 +81,17 @@ public final class ModuleDependencySort { * @param builders builders of Module object * @return Sorted list of Module builders. Modules can be further processed * in returned order. + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ + @Deprecated public static List sort(final ModuleBuilder... builders) { return sort(asList(builders)); } + /** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ + @Deprecated public static List sort(final Collection builders) { List sorted = sortInternal(ModuleOrModuleBuilder.fromAll( Collections.emptySet(),builders)); @@ -382,40 +385,3 @@ public final class ModuleDependencySort { } } -class ModuleOrModuleBuilder { - private final Optional maybeModule; - private final Optional maybeModuleBuilder; - - ModuleOrModuleBuilder(final Module module) { - maybeModule = Optional.of(module); - maybeModuleBuilder = Optional.absent(); - } - - ModuleOrModuleBuilder(final ModuleBuilder moduleBuilder) { - maybeModule = Optional.absent(); - maybeModuleBuilder = Optional.of(moduleBuilder); - } - boolean isModule(){ - return maybeModule.isPresent(); - } - boolean isModuleBuilder(){ - return maybeModuleBuilder.isPresent(); - } - Module getModule(){ - return maybeModule.get(); - } - ModuleBuilder getModuleBuilder(){ - return maybeModuleBuilder.get(); - } - - static List fromAll(final Collection modules, final Collection moduleBuilders) { - List result = new ArrayList<>(modules.size() + moduleBuilders.size()); - for(Module m: modules){ - result.add(new ModuleOrModuleBuilder(m)); - } - for (ModuleBuilder mb : moduleBuilders) { - result.add(new ModuleOrModuleBuilder(mb)); - } - return result; - } -} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleOrModuleBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleOrModuleBuilder.java new file mode 100644 index 0000000000..7e3fcbede7 --- /dev/null +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleOrModuleBuilder.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. 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.parser.util; + +import com.google.common.base.Optional; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.opendaylight.yangtools.yang.model.api.Module; +import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder; + +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + * + * This class needs to be removed and its sole user, {@link ModuleDependencySort}, use Module instances only. + */ +@Deprecated +class ModuleOrModuleBuilder { + private final Optional maybeModule; + private final Optional maybeModuleBuilder; + + ModuleOrModuleBuilder(final Module module) { + maybeModule = Optional.of(module); + maybeModuleBuilder = Optional.absent(); + } + + ModuleOrModuleBuilder(final ModuleBuilder moduleBuilder) { + maybeModule = Optional.absent(); + maybeModuleBuilder = Optional.of(moduleBuilder); + } + boolean isModule(){ + return maybeModule.isPresent(); + } + boolean isModuleBuilder(){ + return maybeModuleBuilder.isPresent(); + } + Module getModule(){ + return maybeModule.get(); + } + ModuleBuilder getModuleBuilder(){ + return maybeModuleBuilder.get(); + } + + static List fromAll(final Collection modules, final Collection moduleBuilders) { + List result = new ArrayList<>(modules.size() + moduleBuilders.size()); + for(Module m: modules){ + result.add(new ModuleOrModuleBuilder(m)); + } + for (ModuleBuilder mb : moduleBuilders) { + result.add(new ModuleOrModuleBuilder(mb)); + } + return result; + } +} \ No newline at end of file diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java index ceb7cd8693..958d5f280b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java @@ -19,7 +19,10 @@ import org.opendaylight.yangtools.yang.model.util.BaseConstraints; /** * Holder object for holding YANG type constraints. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public final class TypeConstraints { private final String moduleName; private final int line; diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/AbstractBuilderTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/AbstractBuilderTest.java index 9e6dca24df..684b068e7c 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/AbstractBuilderTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/AbstractBuilderTest.java @@ -15,7 +15,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder; /** * Created by lukas on 10/14/14. + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public abstract class AbstractBuilderTest { protected final static String MODULE_NAMESPACE = "urn:opendaylight.rpc:def:test-model"; @@ -61,7 +64,7 @@ public abstract class AbstractBuilderTest { return unknownNodeBuilder; } - protected ChoiceBuilder provideChoiceBuilder(String choiceLocalName) { + protected ChoiceBuilder provideChoiceBuilder(final String choiceLocalName) { final QName choiceName = QName.create(module.getNamespace(), module.getRevision(), choiceLocalName); final SchemaPath choicePath = SchemaPath.create(true, choiceName); final ChoiceBuilder choiceBuilder = new ChoiceBuilder(module.getModuleName(), 22, choiceName, choicePath); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtilsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtilsTest.java index 74d38ae920..70d82524cf 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtilsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtilsTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; - +import com.google.common.base.Optional; import java.net.URI; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.NavigableMap; import java.util.TreeMap; - import org.junit.Before; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -43,15 +42,16 @@ import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder; import org.opendaylight.yangtools.yang.parser.util.YangParseException; -import com.google.common.base.Optional; - /** * Test suite for increasing of test coverage of BuilderUtils implementation. * * @see org.opendaylight.yangtools.yang.parser.builder.impl.BuilderUtils * * @author Lukas Sedlak + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public class BuilderUtilsTest { private final static String MASTER_MODULE_NAMESPACE = "urn:opendaylight.master-model"; diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/CopyUtilsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/CopyUtilsTest.java index 31c9341712..06a2af7928 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/CopyUtilsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/CopyUtilsTest.java @@ -34,7 +34,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; * @see org.opendaylight.yangtools.yang.parser.builder.impl.CopyUtils * * @author Lukas Sedlak + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public class CopyUtilsTest extends AbstractBuilderTest { @Test(expected = YangParseException.class) diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilderTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilderTest.java index 5518804955..586239ba06 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilderTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilderTest.java @@ -6,8 +6,12 @@ */ package org.opendaylight.yangtools.yang.parser.builder.impl; -import static org.junit.Assert.*; - +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; @@ -23,7 +27,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuild * @see org.opendaylight.yangtools.yang.parser.builder.impl.LeafListSchemaNodeBuilder * * @author Lukas Sedlak + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public class LeafListSchemaNodeBuilderTest extends AbstractBuilderTest { @Test diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilderTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilderTest.java index 3fd962c159..ffb9c8abf6 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilderTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilderTest.java @@ -33,7 +33,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; * @see org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder * * @author Lukas Sedlak + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public class ModuleBuilderTest { private final static String TEST_MODULE_NAMESPACE = "urn:opendaylight.foo"; diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtilsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtilsTest.java index ada65f3197..f80a7f2735 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtilsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtilsTest.java @@ -25,7 +25,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; * @see org.opendaylight.yangtools.yang.parser.builder.impl.RefineUtils * * @author Lukas Sedlak + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public class RefineUtilsTest extends AbstractBuilderTest { @Test diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilderTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilderTest.java index 59b965c56a..6c756d4c5e 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilderTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilderTest.java @@ -27,7 +27,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuild * @see org.opendaylight.yangtools.yang.parser.builder.impl.RpcDefinitionBuilder * * @author Lukas Sedlak + * + * @deprecated Pre-Beryllium implementation, scheduled for removal. */ +@Deprecated public class RpcDefinitionBuilderTest extends AbstractBuilderTest { @Test diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImplTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImplTest.java index 0ca8e97ffe..4ee663537c 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImplTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImplTest.java @@ -3,10 +3,11 @@ */ package org.opendaylight.yangtools.yang.parser.builder.impl; -import static org.junit.Assert.*; - +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.util.List; - import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -15,6 +16,10 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.util.Int16; import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public class TypeDefinitionBuilderImplTest { @Test diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentationSchemaBuilderImplTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentationSchemaBuilderImplTest.java index 0cf99507b6..ce0648f919 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentationSchemaBuilderImplTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentationSchemaBuilderImplTest.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.parser.impl; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import com.google.common.base.Optional; import com.google.common.collect.Iterables; import org.junit.Before; @@ -18,6 +17,10 @@ import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.parser.builder.impl.AugmentationSchemaBuilderImpl; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public class AugmentationSchemaBuilderImplTest { private AugmentationSchemaBuilderImpl augmentSchemaBuilderImpl; diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/RefineHolderTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/RefineHolderTest.java index 01f4c6662f..0357815419 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/RefineHolderTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/RefineHolderTest.java @@ -26,6 +26,10 @@ import org.opendaylight.yangtools.yang.parser.builder.api.RefineBuilder; import org.opendaylight.yangtools.yang.parser.builder.impl.RefineHolderImpl; import org.opendaylight.yangtools.yang.parser.builder.impl.UnknownSchemaNodeBuilderImpl; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public class RefineHolderTest { private RefineHolderImpl rh; diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/retest/AugmentationSchemaBuilderImplTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/retest/AugmentationSchemaBuilderImplTest.java index a386516284..c86351c81e 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/retest/AugmentationSchemaBuilderImplTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/retest/AugmentationSchemaBuilderImplTest.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.stmt.retest; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import com.google.common.base.Optional; import com.google.common.collect.Iterables; import org.junit.Before; @@ -18,6 +17,10 @@ import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.parser.builder.impl.AugmentationSchemaBuilderImpl; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated public class AugmentationSchemaBuilderImplTest { private AugmentationSchemaBuilderImpl augmentSchemaBuilderImpl; -- 2.36.6