From: Robert Varga Date: Tue, 9 Feb 2021 20:56:52 +0000 (+0100) Subject: Move declared statements to their own package X-Git-Tag: v7.0.0~166 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=771d85afaadfdc25a09726a853b06f173e13d752;p=yangtools.git Move declared statements to their own package Add model.spi.stmt.impl.decl, which is an unexported package, and host declared statement implementations. JIRA: YANGTOOLS-1052 Change-Id: Ia8894ff9c81cc28db81ff1caa015237d35f4d1fc Signed-off-by: Robert Varga --- diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/DeclaredStatements.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/DeclaredStatements.java index 7ed34aef18..e1528968d1 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/DeclaredStatements.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/DeclaredStatements.java @@ -96,6 +96,132 @@ import org.opendaylight.yangtools.yang.model.api.stmt.WhenStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YinElementStatement; import org.opendaylight.yangtools.yang.model.api.type.ModifierKind; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.DeviateStatementImpl; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.DeviationStatementImpl; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyActionStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyAnydataStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyAnyxmlStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyArgumentStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyAugmentStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyBaseStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyBelongsToStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyBitStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyChoiceStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyConfigStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyContainerStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyDefaultStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyDescriptionStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyEnumStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyErrorAppTagStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyErrorMessageStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyExtensionStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyFeatureStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyFractionDigitsStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyGroupingStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyIdentityStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyIfFeatureStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyIncludeStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyInputStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyKeyStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyLeafListStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyLeafStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyLengthStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyListStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyMandatoryStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyMaxElementsStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyMinElementsStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyModifierStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyMustStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyNamespaceStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyNotificationStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyOrderedByStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyOrganizationStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyOutputStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyPathStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyPatternStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyPositionStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyPrefixStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyPresenceStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyRangeStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyReferenceStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyRequireInstanceStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyRevisionDateStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyRevisionStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyRpcStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyStatusStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyTypeStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyTypedefStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyUniqueStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyUnitsStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyUsesStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyValueStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyWhenStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyYangVersionStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyYinElementStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.ImportStatementImpl; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.ModuleStatementImpl; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RefineStatementImpl; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularActionStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularAnydataStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularAnyxmlStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularArgumentStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularAugmentStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularBaseStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularBelongsToStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularBitStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularChoiceStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularConfigStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularContainerStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularDefaultStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularDescriptionStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularEnumStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularErrorAppTagStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularErrorMessageStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularExtensionStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularFeatureStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularFractionDigitsStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularGroupingStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularIdentityStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularIfFeatureStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularIncludeStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularInputStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularKeyStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularLeafListStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularLeafStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularLengthStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularListStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularMandatoryStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularMaxElementsStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularMinElementsStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularModifierStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularMustStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularNamespaceStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularNotificationStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularOrderedByStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularOrganizationStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularOutputStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularPathStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularPatternStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularPositionStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularPrefixStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularPresenceStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularRangeStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularReferenceStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularRequireInstanceStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularRevisionDateStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularRevisionStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularRpcStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularStatusStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularTypeStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularTypedefStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularUniqueStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularUnitsStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularUsesStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularValueStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularWhenStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularYangVersionStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularYinElementStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.SubmoduleStatementImpl; import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBound; /** diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/ImplicitStatements.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/ImplicitStatements.java index aa0eb593cd..b0d609e34e 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/ImplicitStatements.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/ImplicitStatements.java @@ -14,6 +14,10 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.InputStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OutputStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyUndeclaredInputStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.EmptyUndeclaredOutputStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularUndeclaredInputStatement; +import org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl.RegularUndeclaredOutputStatement; /** * Static entry point to instantiating {@link DeclaredStatements} covered in the {@code RFC7950} metamodel which are diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/AbstractDeclaredEffectiveRootStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java similarity index 95% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/AbstractDeclaredEffectiveRootStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java index bdc06523ab..093953d5a0 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/AbstractDeclaredEffectiveRootStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.UnqualifiedQName; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/AbstractKeyStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractKeyStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/AbstractKeyStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractKeyStatement.java index e3a12b06b4..e78cc29296 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/AbstractKeyStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractKeyStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableSet; import java.util.Set; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/AbstractOrderedByStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractOrderedByStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/AbstractOrderedByStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractOrderedByStatement.java index 20515434ac..b0062beaea 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/AbstractOrderedByStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractOrderedByStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/AbstractStatusStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractStatusStatement.java similarity index 94% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/AbstractStatusStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractStatusStatement.java index 52e11f6640..ca45c6d093 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/AbstractStatusStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/AbstractStatusStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/DeviateStatementImpl.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/DeviateStatementImpl.java similarity index 77% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/DeviateStatementImpl.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/DeviateStatementImpl.java index 423c2bb2b1..ca6567d736 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/DeviateStatementImpl.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/DeviateStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.DeviateKind; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DeviateStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; -final class DeviateStatementImpl extends WithSubstatements implements DeviateStatement { - DeviateStatementImpl(final DeviateKind argument, +public final class DeviateStatementImpl extends WithSubstatements implements DeviateStatement { + public DeviateStatementImpl(final DeviateKind argument, final ImmutableList> substatements) { super(argument.getKeyword(), argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/DeviationStatementImpl.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/DeviationStatementImpl.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/DeviationStatementImpl.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/DeviationStatementImpl.java index 11876970f7..56a46a145f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/DeviationStatementImpl.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/DeviationStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.DeviationStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; -final class DeviationStatementImpl extends WithSubstatements implements DeviationStatement { - DeviationStatementImpl(final String rawArgument, final Absolute argument, +public final class DeviationStatementImpl extends WithSubstatements implements DeviationStatement { + public DeviationStatementImpl(final String rawArgument, final Absolute argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyActionStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyActionStatement.java similarity index 72% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyActionStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyActionStatement.java index 81939ab454..d51464304b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyActionStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyActionStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ActionStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyActionStatement extends WithQNameArgument implements ActionStatement { - EmptyActionStatement(final QName argument) { +public final class EmptyActionStatement extends WithQNameArgument implements ActionStatement { + public EmptyActionStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyAnydataStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAnydataStatement.java similarity index 72% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyAnydataStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAnydataStatement.java index 73cf5ac1b6..e8cdb5dc21 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyAnydataStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAnydataStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.AnydataStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyAnydataStatement extends WithQNameArgument implements AnydataStatement { - EmptyAnydataStatement(final QName argument) { +public final class EmptyAnydataStatement extends WithQNameArgument implements AnydataStatement { + public EmptyAnydataStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyAnyxmlStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAnyxmlStatement.java similarity index 72% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyAnyxmlStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAnyxmlStatement.java index 4957e42c20..365acb760d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyAnyxmlStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAnyxmlStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyAnyxmlStatement extends WithQNameArgument implements AnyxmlStatement { - EmptyAnyxmlStatement(final QName argument) { +public final class EmptyAnyxmlStatement extends WithQNameArgument implements AnyxmlStatement { + public EmptyAnyxmlStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyArgumentStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyArgumentStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyArgumentStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyArgumentStatement.java index f2c38826ad..a033096672 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyArgumentStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyArgumentStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ArgumentStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyArgumentStatement extends WithQNameArgument implements ArgumentStatement { - EmptyArgumentStatement(final QName argument) { +public final class EmptyArgumentStatement extends WithQNameArgument implements ArgumentStatement { + public EmptyArgumentStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyAugmentStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAugmentStatement.java similarity index 68% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyAugmentStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAugmentStatement.java index 57c6f85938..0a8220d3b6 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyAugmentStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyAugmentStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; -final class EmptyAugmentStatement extends WithArgument implements AugmentStatement { - EmptyAugmentStatement(final String rawArgument, final SchemaNodeIdentifier argument) { +public final class EmptyAugmentStatement extends WithArgument implements AugmentStatement { + public EmptyAugmentStatement(final String rawArgument, final SchemaNodeIdentifier argument) { super(rawArgument, argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyBaseStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBaseStatement.java similarity index 72% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyBaseStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBaseStatement.java index af6dcd100c..d7e9f1999f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyBaseStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBaseStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.BaseStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyBaseStatement extends WithQNameArgument implements BaseStatement { - EmptyBaseStatement(final QName argument) { +public final class EmptyBaseStatement extends WithQNameArgument implements BaseStatement { + public EmptyBaseStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyBelongsToStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBelongsToStatement.java similarity index 69% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyBelongsToStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBelongsToStatement.java index 8494726a2e..49004a3387 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyBelongsToStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBelongsToStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.BelongsToStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; -final class EmptyBelongsToStatement extends WithRawStringArgument implements BelongsToStatement { - EmptyBelongsToStatement(final String rawArgument) { +public final class EmptyBelongsToStatement extends WithRawStringArgument implements BelongsToStatement { + public EmptyBelongsToStatement(final String rawArgument) { super(rawArgument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyBitStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBitStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyBitStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBitStatement.java index 7184f2cdab..8343b12bad 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyBitStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyBitStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.BitStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; -final class EmptyBitStatement extends WithRawStringArgument implements BitStatement { - EmptyBitStatement(final @NonNull String argument) { +public final class EmptyBitStatement extends WithRawStringArgument implements BitStatement { + public EmptyBitStatement(final @NonNull String argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyChoiceStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyChoiceStatement.java similarity index 72% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyChoiceStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyChoiceStatement.java index c85eb6dbfb..dbe8cb18b3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyChoiceStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyChoiceStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyChoiceStatement extends WithQNameArgument implements ChoiceStatement { - EmptyChoiceStatement(final QName argument) { +public final class EmptyChoiceStatement extends WithQNameArgument implements ChoiceStatement { + public EmptyChoiceStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyConfigStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyConfigStatement.java similarity index 69% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyConfigStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyConfigStatement.java index a82c484da3..44ae4b9a76 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyConfigStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyConfigStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.ConfigStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; -final class EmptyConfigStatement extends ArgumentToString implements ConfigStatement { - EmptyConfigStatement(final Boolean argument) { +public final class EmptyConfigStatement extends ArgumentToString implements ConfigStatement { + public EmptyConfigStatement(final Boolean argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyContainerStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyContainerStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyContainerStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyContainerStatement.java index f51e54dd57..321d50b049 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyContainerStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyContainerStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ContainerStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyContainerStatement extends WithQNameArgument implements ContainerStatement { - EmptyContainerStatement(final QName argument) { +public final class EmptyContainerStatement extends WithQNameArgument implements ContainerStatement { + public EmptyContainerStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyDefaultStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyDefaultStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyDefaultStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyDefaultStatement.java index ce522888e9..b0b00811fc 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyDefaultStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyDefaultStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.DefaultStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; -final class EmptyDefaultStatement extends WithRawStringArgument implements DefaultStatement { - EmptyDefaultStatement(final @NonNull String rawArgument) { +public final class EmptyDefaultStatement extends WithRawStringArgument implements DefaultStatement { + public EmptyDefaultStatement(final @NonNull String rawArgument) { super(rawArgument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyDescriptionStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyDescriptionStatement.java similarity index 69% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyDescriptionStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyDescriptionStatement.java index 95ff187246..9d025706ff 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyDescriptionStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyDescriptionStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; -final class EmptyDescriptionStatement extends WithRawStringArgument implements DescriptionStatement { - EmptyDescriptionStatement(final @NonNull String rawArgument) { +public final class EmptyDescriptionStatement extends WithRawStringArgument implements DescriptionStatement { + public EmptyDescriptionStatement(final @NonNull String rawArgument) { super(rawArgument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyEnumStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyEnumStatement.java similarity index 68% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyEnumStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyEnumStatement.java index 884a19c413..2af445d016 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyEnumStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyEnumStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.EnumStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; -final class EmptyEnumStatement extends WithArgument implements EnumStatement { - EmptyEnumStatement(final String rawArgument, final String argument) { +public final class EmptyEnumStatement extends WithArgument implements EnumStatement { + public EmptyEnumStatement(final String rawArgument, final String argument) { super(rawArgument, argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyErrorAppTagStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyErrorAppTagStatement.java similarity index 69% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyErrorAppTagStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyErrorAppTagStatement.java index 5d53f2306d..326314b949 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyErrorAppTagStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyErrorAppTagStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorAppTagStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; -final class EmptyErrorAppTagStatement extends WithRawStringArgument implements ErrorAppTagStatement { - EmptyErrorAppTagStatement(final @NonNull String rawArgument) { +public final class EmptyErrorAppTagStatement extends WithRawStringArgument implements ErrorAppTagStatement { + public EmptyErrorAppTagStatement(final @NonNull String rawArgument) { super(rawArgument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyErrorMessageStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyErrorMessageStatement.java similarity index 69% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyErrorMessageStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyErrorMessageStatement.java index ec912c3cad..c4de141a9d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyErrorMessageStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyErrorMessageStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorMessageStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; -final class EmptyErrorMessageStatement extends WithRawStringArgument implements ErrorMessageStatement { - EmptyErrorMessageStatement(final @NonNull String rawArgument) { +public final class EmptyErrorMessageStatement extends WithRawStringArgument implements ErrorMessageStatement { + public EmptyErrorMessageStatement(final @NonNull String rawArgument) { super(rawArgument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyExtensionStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyExtensionStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyExtensionStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyExtensionStatement.java index e42f2485c5..e517e2be6d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyExtensionStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyExtensionStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyExtensionStatement extends WithQNameArgument implements ExtensionStatement { - EmptyExtensionStatement(final QName argument) { +public final class EmptyExtensionStatement extends WithQNameArgument implements ExtensionStatement { + public EmptyExtensionStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyFeatureStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyFeatureStatement.java similarity index 72% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyFeatureStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyFeatureStatement.java index 849652514e..692b0f54ed 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyFeatureStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyFeatureStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.FeatureStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyFeatureStatement extends WithQNameArgument implements FeatureStatement { - EmptyFeatureStatement(final QName argument) { +public final class EmptyFeatureStatement extends WithQNameArgument implements FeatureStatement { + public EmptyFeatureStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyFractionDigitsStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyFractionDigitsStatement.java similarity index 67% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyFractionDigitsStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyFractionDigitsStatement.java index 2578ff5791..f693f7ca1f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyFractionDigitsStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyFractionDigitsStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.FractionDigitsStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; -final class EmptyFractionDigitsStatement extends ArgumentToString implements FractionDigitsStatement { - EmptyFractionDigitsStatement(final Integer argument) { +public final class EmptyFractionDigitsStatement extends ArgumentToString implements FractionDigitsStatement { + public EmptyFractionDigitsStatement(final Integer argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyGroupingStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyGroupingStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyGroupingStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyGroupingStatement.java index 625ab765d7..bdbbaa4317 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyGroupingStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyGroupingStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.GroupingStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyGroupingStatement extends WithQNameArgument implements GroupingStatement { - EmptyGroupingStatement(final QName argument) { +public final class EmptyGroupingStatement extends WithQNameArgument implements GroupingStatement { + public EmptyGroupingStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyIdentityStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIdentityStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyIdentityStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIdentityStatement.java index 296e74b632..f47463046c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyIdentityStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIdentityStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.IdentityStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyIdentityStatement extends WithQNameArgument implements IdentityStatement { - EmptyIdentityStatement(final QName argument) { +public final class EmptyIdentityStatement extends WithQNameArgument implements IdentityStatement { + public EmptyIdentityStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyIfFeatureStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIfFeatureStatement.java similarity index 68% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyIfFeatureStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIfFeatureStatement.java index 5ef8f32ca5..f3d9a3680c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyIfFeatureStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIfFeatureStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureExpr; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; -final class EmptyIfFeatureStatement extends WithArgument implements IfFeatureStatement { - EmptyIfFeatureStatement(final @NonNull String rawArgument, final @NonNull IfFeatureExpr argument) { +public final class EmptyIfFeatureStatement extends WithArgument implements IfFeatureStatement { + public EmptyIfFeatureStatement(final @NonNull String rawArgument, final @NonNull IfFeatureExpr argument) { super(rawArgument, argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyIncludeStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIncludeStatement.java similarity index 67% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyIncludeStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIncludeStatement.java index bded01cea4..a0f101e4f9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyIncludeStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyIncludeStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.IncludeStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; -final class EmptyIncludeStatement extends WithArgument implements IncludeStatement { - EmptyIncludeStatement(final String rawArgument, final String argument) { +public final class EmptyIncludeStatement extends WithArgument implements IncludeStatement { + public EmptyIncludeStatement(final String rawArgument, final String argument) { super(rawArgument, argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyInputStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyInputStatement.java similarity index 73% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyInputStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyInputStatement.java index 3d3f8c70de..f03d9de84f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyInputStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyInputStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.InputStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -class EmptyInputStatement extends WithQNameArgument implements InputStatement { - EmptyInputStatement(final QName argument) { +public class EmptyInputStatement extends WithQNameArgument implements InputStatement { + public EmptyInputStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyKeyStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyKeyStatement.java similarity index 66% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyKeyStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyKeyStatement.java index 827f3d9f8c..447d8f6582 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyKeyStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyKeyStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QName; -final class EmptyKeyStatement extends AbstractKeyStatement { - EmptyKeyStatement(final @NonNull String rawArgument, final @NonNull Set argument) { +public final class EmptyKeyStatement extends AbstractKeyStatement { + public EmptyKeyStatement(final @NonNull String rawArgument, final @NonNull Set argument) { super(rawArgument, argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyLeafListStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLeafListStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyLeafListStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLeafListStatement.java index 6f8d62247e..da1c6e9473 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyLeafListStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLeafListStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.LeafListStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyLeafListStatement extends WithQNameArgument implements LeafListStatement { - EmptyLeafListStatement(final QName argument) { +public final class EmptyLeafListStatement extends WithQNameArgument implements LeafListStatement { + public EmptyLeafListStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyLeafStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLeafStatement.java similarity index 72% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyLeafStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLeafStatement.java index 2b6ac9a38b..dba4ac8100 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyLeafStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLeafStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.LeafStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyLeafStatement extends WithQNameArgument implements LeafStatement { - EmptyLeafStatement(final QName argument) { +public final class EmptyLeafStatement extends WithQNameArgument implements LeafStatement { + public EmptyLeafStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyLengthStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLengthStatement.java similarity index 69% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyLengthStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLengthStatement.java index 8eada0fd1f..26ffb76508 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyLengthStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyLengthStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import java.util.List; import org.opendaylight.yangtools.yang.model.api.stmt.LengthStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ValueRange; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; -final class EmptyLengthStatement extends WithArgument> implements LengthStatement { - EmptyLengthStatement(final String rawArgument, final List argument) { +public final class EmptyLengthStatement extends WithArgument> implements LengthStatement { + public EmptyLengthStatement(final String rawArgument, final List argument) { super(rawArgument, argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyListStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyListStatement.java similarity index 72% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyListStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyListStatement.java index 84f4f41ff6..ce8994e35c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyListStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyListStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ListStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyListStatement extends WithQNameArgument implements ListStatement { - EmptyListStatement(final QName argument) { +public final class EmptyListStatement extends WithQNameArgument implements ListStatement { + public EmptyListStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyMandatoryStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMandatoryStatement.java similarity index 68% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyMandatoryStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMandatoryStatement.java index d192064431..b861463bb5 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyMandatoryStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMandatoryStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; -final class EmptyMandatoryStatement extends ArgumentToString implements MandatoryStatement { - EmptyMandatoryStatement(final Boolean argument) { +public final class EmptyMandatoryStatement extends ArgumentToString implements MandatoryStatement { + public EmptyMandatoryStatement(final Boolean argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyMaxElementsStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMaxElementsStatement.java similarity index 66% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyMaxElementsStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMaxElementsStatement.java index 839a9d940c..17e63bdd70 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyMaxElementsStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMaxElementsStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.MaxElementsStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; -final class EmptyMaxElementsStatement extends WithArgument implements MaxElementsStatement { - EmptyMaxElementsStatement(final String rawArgument, final String argument) { +public final class EmptyMaxElementsStatement extends WithArgument implements MaxElementsStatement { + public EmptyMaxElementsStatement(final String rawArgument, final String argument) { super(rawArgument, argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyMinElementsStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMinElementsStatement.java similarity index 68% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyMinElementsStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMinElementsStatement.java index ce2b2894ca..68f3fcc8af 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyMinElementsStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMinElementsStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.MinElementsStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; -final class EmptyMinElementsStatement extends ArgumentToString implements MinElementsStatement { - EmptyMinElementsStatement(final Integer argument) { +public final class EmptyMinElementsStatement extends ArgumentToString implements MinElementsStatement { + public EmptyMinElementsStatement(final Integer argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyModifierStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyModifierStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyModifierStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyModifierStatement.java index f28a8974d9..bf6cea68e3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyModifierStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyModifierStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.ModifierStatement; import org.opendaylight.yangtools.yang.model.api.type.ModifierKind; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; -final class EmptyModifierStatement extends WithArgument implements ModifierStatement { - EmptyModifierStatement(final ModifierKind argument) { +public final class EmptyModifierStatement extends WithArgument implements ModifierStatement { + public EmptyModifierStatement(final ModifierKind argument) { super(argument.getKeyword(), argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyMustStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMustStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyMustStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMustStatement.java index b81cb70d20..96950ab56e 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyMustStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyMustStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.MustStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBound; -final class EmptyMustStatement extends WithArgument implements MustStatement { - EmptyMustStatement(final String rawArgument, final QualifiedBound argument) { +public final class EmptyMustStatement extends WithArgument implements MustStatement { + public EmptyMustStatement(final String rawArgument, final QualifiedBound argument) { super(rawArgument, argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyNamespaceStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyNamespaceStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyNamespaceStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyNamespaceStatement.java index dda5ec5b6e..df4e27af5b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyNamespaceStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyNamespaceStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; -final class EmptyNamespaceStatement extends ArgumentToString implements NamespaceStatement { - EmptyNamespaceStatement(final XMLNamespace argument) { +public final class EmptyNamespaceStatement extends ArgumentToString implements NamespaceStatement { + public EmptyNamespaceStatement(final XMLNamespace argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyNotificationStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyNotificationStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyNotificationStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyNotificationStatement.java index bf5d36827e..a67b4c27ff 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyNotificationStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyNotificationStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.NotificationStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyNotificationStatement extends WithQNameArgument implements NotificationStatement { - EmptyNotificationStatement(final QName argument) { +public final class EmptyNotificationStatement extends WithQNameArgument implements NotificationStatement { + public EmptyNotificationStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyOrderedByStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOrderedByStatement.java similarity index 65% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyOrderedByStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOrderedByStatement.java index 5d37af5c42..800f776128 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyOrderedByStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOrderedByStatement.java @@ -5,12 +5,12 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.Ordering; -final class EmptyOrderedByStatement extends AbstractOrderedByStatement { - EmptyOrderedByStatement(final Ordering argument) { +public final class EmptyOrderedByStatement extends AbstractOrderedByStatement { + public EmptyOrderedByStatement(final Ordering argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyOrganizationStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOrganizationStatement.java similarity index 69% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyOrganizationStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOrganizationStatement.java index 8203a52e77..e8dbf93537 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyOrganizationStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOrganizationStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.OrganizationStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; -final class EmptyOrganizationStatement extends WithRawStringArgument implements OrganizationStatement { - EmptyOrganizationStatement(final @NonNull String rawArgument) { +public final class EmptyOrganizationStatement extends WithRawStringArgument implements OrganizationStatement { + public EmptyOrganizationStatement(final @NonNull String rawArgument) { super(rawArgument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyOutputStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOutputStatement.java similarity index 72% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyOutputStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOutputStatement.java index f0aa6e7a00..8f061552ab 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyOutputStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyOutputStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.OutputStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -class EmptyOutputStatement extends WithQNameArgument implements OutputStatement { - EmptyOutputStatement(final QName argument) { +public class EmptyOutputStatement extends WithQNameArgument implements OutputStatement { + public EmptyOutputStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPathStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPathStatement.java similarity index 79% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPathStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPathStatement.java index 06e3f61b35..bc9987c852 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPathStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPathStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import static java.util.Objects.requireNonNull; @@ -14,10 +14,10 @@ import org.opendaylight.yangtools.yang.model.api.PathExpression; import org.opendaylight.yangtools.yang.model.api.stmt.PathStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement; -class EmptyPathStatement extends AbstractDeclaredStatement implements PathStatement { +public class EmptyPathStatement extends AbstractDeclaredStatement implements PathStatement { private final @NonNull PathExpression argument; - EmptyPathStatement(final PathExpression argument) { + public EmptyPathStatement(final PathExpression argument) { this.argument = requireNonNull(argument); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPatternStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPatternStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPatternStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPatternStatement.java index 752345ecc3..edf59eecdd 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPatternStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPatternStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.PatternExpression; import org.opendaylight.yangtools.yang.model.api.stmt.PatternStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; -final class EmptyPatternStatement extends ArgumentToString implements PatternStatement { - EmptyPatternStatement(final PatternExpression argument) { +public final class EmptyPatternStatement extends ArgumentToString implements PatternStatement { + public EmptyPatternStatement(final PatternExpression argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPositionStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPositionStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPositionStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPositionStatement.java index c398c2ddc3..c4b1180b7a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPositionStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPositionStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.model.api.stmt.PositionStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; -final class EmptyPositionStatement extends ArgumentToString implements PositionStatement { - EmptyPositionStatement(final Uint32 argument) { +public final class EmptyPositionStatement extends ArgumentToString implements PositionStatement { + public EmptyPositionStatement(final Uint32 argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPrefixStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPrefixStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPrefixStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPrefixStatement.java index c3c4806f02..714968937d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPrefixStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPrefixStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; -final class EmptyPrefixStatement extends WithRawStringArgument implements PrefixStatement { - EmptyPrefixStatement(final @NonNull String rawArgument) { +public final class EmptyPrefixStatement extends WithRawStringArgument implements PrefixStatement { + public EmptyPrefixStatement(final @NonNull String rawArgument) { super(rawArgument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPresenceStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPresenceStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPresenceStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPresenceStatement.java index bd1cd57869..c940127876 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyPresenceStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyPresenceStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.PresenceStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; -final class EmptyPresenceStatement extends WithRawStringArgument implements PresenceStatement { - EmptyPresenceStatement(final @NonNull String rawArgument) { +public final class EmptyPresenceStatement extends WithRawStringArgument implements PresenceStatement { + public EmptyPresenceStatement(final @NonNull String rawArgument) { super(rawArgument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRangeStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRangeStatement.java similarity index 69% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRangeStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRangeStatement.java index 6590a118e7..7416df0a6a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRangeStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRangeStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import java.util.List; import org.opendaylight.yangtools.yang.model.api.stmt.RangeStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ValueRange; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; -final class EmptyRangeStatement extends WithArgument> implements RangeStatement { - EmptyRangeStatement(final String rawArgument, final List argument) { +public final class EmptyRangeStatement extends WithArgument> implements RangeStatement { + public EmptyRangeStatement(final String rawArgument, final List argument) { super(rawArgument, argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyReferenceStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyReferenceStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyReferenceStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyReferenceStatement.java index 0ab4806b67..bad7bc6e57 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyReferenceStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyReferenceStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; -final class EmptyReferenceStatement extends WithRawStringArgument implements ReferenceStatement { - EmptyReferenceStatement(final @NonNull String rawArgument) { +public final class EmptyReferenceStatement extends WithRawStringArgument implements ReferenceStatement { + public EmptyReferenceStatement(final @NonNull String rawArgument) { super(rawArgument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRequireInstanceStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRequireInstanceStatement.java similarity index 67% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRequireInstanceStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRequireInstanceStatement.java index 87030decb3..bd50ca72ba 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRequireInstanceStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRequireInstanceStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; -final class EmptyRequireInstanceStatement extends ArgumentToString implements RequireInstanceStatement { - EmptyRequireInstanceStatement(final Boolean argument) { +public final class EmptyRequireInstanceStatement extends ArgumentToString implements RequireInstanceStatement { + public EmptyRequireInstanceStatement(final Boolean argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRevisionDateStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRevisionDateStatement.java similarity index 69% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRevisionDateStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRevisionDateStatement.java index eaf9f206c9..742c985a67 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRevisionDateStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRevisionDateStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.stmt.RevisionDateStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; -final class EmptyRevisionDateStatement extends ArgumentToString implements RevisionDateStatement { - EmptyRevisionDateStatement(final Revision argument) { +public final class EmptyRevisionDateStatement extends ArgumentToString implements RevisionDateStatement { + public EmptyRevisionDateStatement(final Revision argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRevisionStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRevisionStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRevisionStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRevisionStatement.java index e510556cb3..4224afa96d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRevisionStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRevisionStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.stmt.RevisionStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; -final class EmptyRevisionStatement extends ArgumentToString implements RevisionStatement { - EmptyRevisionStatement(final Revision argument) { +public final class EmptyRevisionStatement extends ArgumentToString implements RevisionStatement { + public EmptyRevisionStatement(final Revision argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRpcStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRpcStatement.java similarity index 73% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRpcStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRpcStatement.java index 0e17f3ace5..dceaabdd96 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyRpcStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyRpcStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.RpcStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyRpcStatement extends WithQNameArgument implements RpcStatement { - EmptyRpcStatement(final QName argument) { +public final class EmptyRpcStatement extends WithQNameArgument implements RpcStatement { + public EmptyRpcStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyStatusStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyStatusStatement.java similarity index 67% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyStatusStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyStatusStatement.java index 4d50e6ab66..f59e9159a4 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyStatusStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyStatusStatement.java @@ -5,12 +5,12 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.Status; -final class EmptyStatusStatement extends AbstractStatusStatement { - EmptyStatusStatement(final Status argument) { +public final class EmptyStatusStatement extends AbstractStatusStatement { + public EmptyStatusStatement(final Status argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyTypeStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyTypeStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyTypeStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyTypeStatement.java index 750676ed70..3ef7603898 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyTypeStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyTypeStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; -final class EmptyTypeStatement extends WithRawStringArgument implements TypeStatement { - EmptyTypeStatement(final String rawArgument) { +public final class EmptyTypeStatement extends WithRawStringArgument implements TypeStatement { + public EmptyTypeStatement(final String rawArgument) { super(rawArgument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyTypedefStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyTypedefStatement.java similarity index 72% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyTypedefStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyTypedefStatement.java index 00604ff3c9..cca940e76b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyTypedefStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyTypedefStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument; -final class EmptyTypedefStatement extends WithQNameArgument implements TypedefStatement { - EmptyTypedefStatement(final QName argument) { +public final class EmptyTypedefStatement extends WithQNameArgument implements TypedefStatement { + public EmptyTypedefStatement(final QName argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUndeclaredInputStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUndeclaredInputStatement.java similarity index 73% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUndeclaredInputStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUndeclaredInputStatement.java index 068833e832..98683956bc 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUndeclaredInputStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUndeclaredInputStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.StatementSource; -final class EmptyUndeclaredInputStatement extends EmptyInputStatement { - EmptyUndeclaredInputStatement(final QName argument) { +public final class EmptyUndeclaredInputStatement extends EmptyInputStatement { + public EmptyUndeclaredInputStatement(final QName argument) { super(argument); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUndeclaredOutputStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUndeclaredOutputStatement.java similarity index 73% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUndeclaredOutputStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUndeclaredOutputStatement.java index 1025c3e09b..5ba532bae2 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUndeclaredOutputStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUndeclaredOutputStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.StatementSource; -final class EmptyUndeclaredOutputStatement extends EmptyOutputStatement { - EmptyUndeclaredOutputStatement(final QName argument) { +public final class EmptyUndeclaredOutputStatement extends EmptyOutputStatement { + public EmptyUndeclaredOutputStatement(final QName argument) { super(argument); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUniqueStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUniqueStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUniqueStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUniqueStatement.java index 4bc2c9572c..9865953f57 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUniqueStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUniqueStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import java.util.Set; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Descendant; import org.opendaylight.yangtools.yang.model.api.stmt.UniqueStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; -final class EmptyUniqueStatement extends WithArgument> implements UniqueStatement { - EmptyUniqueStatement(final String rawArgument, final Set argument) { +public final class EmptyUniqueStatement extends WithArgument> implements UniqueStatement { + public EmptyUniqueStatement(final String rawArgument, final Set argument) { super(rawArgument, argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUnitsStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUnitsStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUnitsStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUnitsStatement.java index 9d260b8c2e..07b4e7e686 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUnitsStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUnitsStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument; -final class EmptyUnitsStatement extends WithRawStringArgument implements UnitsStatement { - EmptyUnitsStatement(final @NonNull String rawArgument) { +public final class EmptyUnitsStatement extends WithRawStringArgument implements UnitsStatement { + public EmptyUnitsStatement(final @NonNull String rawArgument) { super(rawArgument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUsesStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUsesStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUsesStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUsesStatement.java index 472f0dfe1c..f71f070355 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyUsesStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyUsesStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.UsesStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; -final class EmptyUsesStatement extends WithArgument implements UsesStatement { - EmptyUsesStatement(final String rawArgument, final QName argument) { +public final class EmptyUsesStatement extends WithArgument implements UsesStatement { + public EmptyUsesStatement(final String rawArgument, final QName argument) { super(rawArgument, argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyValueStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyValueStatement.java similarity index 69% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyValueStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyValueStatement.java index 76ba9d8b0c..340b723084 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyValueStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyValueStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.ValueStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; -final class EmptyValueStatement extends ArgumentToString implements ValueStatement { - EmptyValueStatement(final Integer argument) { +public final class EmptyValueStatement extends ArgumentToString implements ValueStatement { + public EmptyValueStatement(final Integer argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyWhenStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyWhenStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyWhenStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyWhenStatement.java index a37e8afd71..a1b0964853 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyWhenStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyWhenStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.WhenStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument; import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBound; -final class EmptyWhenStatement extends WithArgument implements WhenStatement { - EmptyWhenStatement(final String rawArgument, final QualifiedBound argument) { +public final class EmptyWhenStatement extends WithArgument implements WhenStatement { + public EmptyWhenStatement(final String rawArgument, final QualifiedBound argument) { super(rawArgument, argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyYangVersionStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyYangVersionStatement.java similarity index 69% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyYangVersionStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyYangVersionStatement.java index 42f0a8d33a..37bf0d3ef8 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyYangVersionStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyYangVersionStatement.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.common.YangVersion; import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; -final class EmptyYangVersionStatement extends ArgumentToString implements YangVersionStatement { - EmptyYangVersionStatement(final YangVersion argument) { +public final class EmptyYangVersionStatement extends ArgumentToString implements YangVersionStatement { + public EmptyYangVersionStatement(final YangVersion argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyYinElementStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyYinElementStatement.java similarity index 68% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyYinElementStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyYinElementStatement.java index 2708af7627..30c33b7666 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/EmptyYinElementStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/EmptyYinElementStatement.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import org.opendaylight.yangtools.yang.model.api.stmt.YinElementStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString; -final class EmptyYinElementStatement extends ArgumentToString implements YinElementStatement { - EmptyYinElementStatement(final Boolean argument) { +public final class EmptyYinElementStatement extends ArgumentToString implements YinElementStatement { + public EmptyYinElementStatement(final Boolean argument) { super(argument); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/ImportStatementImpl.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/ImportStatementImpl.java similarity index 77% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/ImportStatementImpl.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/ImportStatementImpl.java index 14423ac9d9..28d8ceb86e 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/ImportStatementImpl.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/ImportStatementImpl.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ImportStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -final class ImportStatementImpl extends WithSubstatements implements ImportStatement { - ImportStatementImpl(final String rawArgument, +public final class ImportStatementImpl extends WithSubstatements implements ImportStatement { + public ImportStatementImpl(final String rawArgument, final ImmutableList> substatements) { super(rawArgument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/ModuleStatementImpl.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/ModuleStatementImpl.java similarity index 74% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/ModuleStatementImpl.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/ModuleStatementImpl.java index b07c50ffab..a75f63f084 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/ModuleStatementImpl.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/ModuleStatementImpl.java @@ -5,16 +5,16 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.UnqualifiedQName; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ModuleStatement; -final class ModuleStatementImpl extends AbstractDeclaredEffectiveRootStatement +public final class ModuleStatementImpl extends AbstractDeclaredEffectiveRootStatement implements ModuleStatement { - ModuleStatementImpl(final String rawArgument, final UnqualifiedQName argument, + public ModuleStatementImpl(final String rawArgument, final UnqualifiedQName argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RefineStatementImpl.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RefineStatementImpl.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RefineStatementImpl.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RefineStatementImpl.java index 7b7b7384aa..fb91b97bc6 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RefineStatementImpl.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RefineStatementImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.RefineStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Descendant; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; -final class RefineStatementImpl extends WithSubstatements implements RefineStatement { - RefineStatementImpl(final String rawArgument, final Descendant argument, +public final class RefineStatementImpl extends WithSubstatements implements RefineStatement { + public RefineStatementImpl(final String rawArgument, final Descendant argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularActionStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularActionStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularActionStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularActionStatement.java index b6fe51bb7c..4ae39718a7 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularActionStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularActionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ActionStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularActionStatement extends WithSubstatements implements ActionStatement { - RegularActionStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularActionStatement extends WithSubstatements implements ActionStatement { + public RegularActionStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularAnydataStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAnydataStatement.java similarity index 68% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularAnydataStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAnydataStatement.java index bb0ddb0383..f992645ad3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularAnydataStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAnydataStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,11 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AnydataStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -/** - * YANG 1.1 AnyData declared statement implementation. - */ -final class RegularAnydataStatement extends WithSubstatements implements AnydataStatement { - RegularAnydataStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularAnydataStatement extends WithSubstatements implements AnydataStatement { + public RegularAnydataStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularAnyxmlStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAnyxmlStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularAnyxmlStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAnyxmlStatement.java index 9a740ba75c..ac55ef7095 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularAnyxmlStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAnyxmlStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularAnyxmlStatement extends WithSubstatements implements AnyxmlStatement { - RegularAnyxmlStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularAnyxmlStatement extends WithSubstatements implements AnyxmlStatement { + public RegularAnyxmlStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularArgumentStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularArgumentStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularArgumentStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularArgumentStatement.java index 5086732660..ca1875869b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularArgumentStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularArgumentStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ArgumentStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularArgumentStatement extends WithSubstatements implements ArgumentStatement { - RegularArgumentStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularArgumentStatement extends WithSubstatements implements ArgumentStatement { + public RegularArgumentStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularAugmentStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAugmentStatement.java similarity index 74% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularAugmentStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAugmentStatement.java index 8eeeb43060..baeeb8db17 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularAugmentStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularAugmentStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; -final class RegularAugmentStatement extends WithSubstatements implements AugmentStatement { - RegularAugmentStatement(final @NonNull String rawArgument, final @NonNull SchemaNodeIdentifier argument, +public final class RegularAugmentStatement extends WithSubstatements implements AugmentStatement { + public RegularAugmentStatement(final @NonNull String rawArgument, final @NonNull SchemaNodeIdentifier argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularBaseStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBaseStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularBaseStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBaseStatement.java index ded4d6c36d..7f92bcde5d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularBaseStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBaseStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.BaseStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularBaseStatement extends WithSubstatements implements BaseStatement { - RegularBaseStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularBaseStatement extends WithSubstatements implements BaseStatement { + public RegularBaseStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularBelongsToStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBelongsToStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularBelongsToStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBelongsToStatement.java index 755509f72e..b3555b8aa1 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularBelongsToStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBelongsToStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.BelongsToStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -final class RegularBelongsToStatement extends WithSubstatements implements BelongsToStatement { - RegularBelongsToStatement(final @NonNull String rawArgument, +public final class RegularBelongsToStatement extends WithSubstatements implements BelongsToStatement { + public RegularBelongsToStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { super(rawArgument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularBitStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBitStatement.java similarity index 78% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularBitStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBitStatement.java index 0541e628ac..5975c2f01a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularBitStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularBitStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.BitStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -final class RegularBitStatement extends WithSubstatements implements BitStatement { - RegularBitStatement(final @NonNull String argument, +public final class RegularBitStatement extends WithSubstatements implements BitStatement { + public RegularBitStatement(final @NonNull String argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularChoiceStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularChoiceStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularChoiceStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularChoiceStatement.java index f773f1ced7..5f7bd905d7 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularChoiceStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularChoiceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularChoiceStatement extends WithSubstatements implements ChoiceStatement { - RegularChoiceStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularChoiceStatement extends WithSubstatements implements ChoiceStatement { + public RegularChoiceStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularConfigStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularConfigStatement.java similarity index 68% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularConfigStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularConfigStatement.java index a073324fdc..c580bee230 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularConfigStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularConfigStatement.java @@ -5,15 +5,16 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ConfigStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString.WithSubstatements; -final class RegularConfigStatement extends WithSubstatements implements ConfigStatement { - RegularConfigStatement(final Boolean argument, final ImmutableList> substatements) { +public final class RegularConfigStatement extends WithSubstatements implements ConfigStatement { + public RegularConfigStatement(final Boolean argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularContainerStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularContainerStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularContainerStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularContainerStatement.java index 8437c7e2af..903cc7b517 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularContainerStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularContainerStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ContainerStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularContainerStatement extends WithSubstatements implements ContainerStatement { - RegularContainerStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularContainerStatement extends WithSubstatements implements ContainerStatement { + public RegularContainerStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularDefaultStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularDefaultStatement.java similarity index 77% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularDefaultStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularDefaultStatement.java index f79493b7ab..3b887b8a75 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularDefaultStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularDefaultStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DefaultStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -final class RegularDefaultStatement extends WithSubstatements implements DefaultStatement { - RegularDefaultStatement(final @NonNull String rawArgument, +public final class RegularDefaultStatement extends WithSubstatements implements DefaultStatement { + public RegularDefaultStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { super(rawArgument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularDescriptionStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularDescriptionStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularDescriptionStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularDescriptionStatement.java index 4e6fbe2f64..49594ba282 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularDescriptionStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularDescriptionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -final class RegularDescriptionStatement extends WithSubstatements implements DescriptionStatement { - RegularDescriptionStatement(final @NonNull String rawArgument, +public final class RegularDescriptionStatement extends WithSubstatements implements DescriptionStatement { + public RegularDescriptionStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { super(rawArgument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularEnumStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularEnumStatement.java similarity index 75% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularEnumStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularEnumStatement.java index 3e6f89aed2..b4c4b78db9 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularEnumStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularEnumStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.EnumStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; -final class RegularEnumStatement extends WithSubstatements implements EnumStatement { - RegularEnumStatement(final String rawArgument, final String argument, +public final class RegularEnumStatement extends WithSubstatements implements EnumStatement { + public RegularEnumStatement(final String rawArgument, final String argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularErrorAppTagStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularErrorAppTagStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularErrorAppTagStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularErrorAppTagStatement.java index 4684d9adaa..dcc97b182c 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularErrorAppTagStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularErrorAppTagStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorAppTagStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -final class RegularErrorAppTagStatement extends WithSubstatements implements ErrorAppTagStatement { - RegularErrorAppTagStatement(final @NonNull String rawArgument, +public final class RegularErrorAppTagStatement extends WithSubstatements implements ErrorAppTagStatement { + public RegularErrorAppTagStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { super(rawArgument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularErrorMessageStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularErrorMessageStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularErrorMessageStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularErrorMessageStatement.java index e8e23c0365..4395683e98 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularErrorMessageStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularErrorMessageStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ErrorMessageStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -final class RegularErrorMessageStatement extends WithSubstatements implements ErrorMessageStatement { - RegularErrorMessageStatement(final @NonNull String rawArgument, +public final class RegularErrorMessageStatement extends WithSubstatements implements ErrorMessageStatement { + public RegularErrorMessageStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { super(rawArgument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularExtensionStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularExtensionStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularExtensionStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularExtensionStatement.java index 8df672e1b9..c307e6845b 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularExtensionStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularExtensionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularExtensionStatement extends WithSubstatements implements ExtensionStatement { - RegularExtensionStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularExtensionStatement extends WithSubstatements implements ExtensionStatement { + public RegularExtensionStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularFeatureStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularFeatureStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularFeatureStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularFeatureStatement.java index ef3ef5dd12..3d27a696be 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularFeatureStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularFeatureStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.FeatureStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularFeatureStatement extends WithSubstatements implements FeatureStatement { - RegularFeatureStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularFeatureStatement extends WithSubstatements implements FeatureStatement { + public RegularFeatureStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularFractionDigitsStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularFractionDigitsStatement.java similarity index 74% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularFractionDigitsStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularFractionDigitsStatement.java index 6b9e78ef44..6817122237 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularFractionDigitsStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularFractionDigitsStatement.java @@ -5,15 +5,16 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.FractionDigitsStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString.WithSubstatements; -final class RegularFractionDigitsStatement extends WithSubstatements implements FractionDigitsStatement { - RegularFractionDigitsStatement(final Integer argument, +public final class RegularFractionDigitsStatement extends WithSubstatements + implements FractionDigitsStatement { + public RegularFractionDigitsStatement(final Integer argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularGroupingStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularGroupingStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularGroupingStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularGroupingStatement.java index 31d2074cb4..09eb528e70 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularGroupingStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularGroupingStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.GroupingStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularGroupingStatement extends WithSubstatements implements GroupingStatement { - RegularGroupingStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularGroupingStatement extends WithSubstatements implements GroupingStatement { + public RegularGroupingStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularIdentityStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIdentityStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularIdentityStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIdentityStatement.java index d4631b6032..a49e82f8c3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularIdentityStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIdentityStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IdentityStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularIdentityStatement extends WithSubstatements implements IdentityStatement { - RegularIdentityStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularIdentityStatement extends WithSubstatements implements IdentityStatement { + public RegularIdentityStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularIfFeatureStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIfFeatureStatement.java similarity index 74% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularIfFeatureStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIfFeatureStatement.java index 578034a994..345e047818 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularIfFeatureStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIfFeatureStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureExpr; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; -final class RegularIfFeatureStatement extends WithSubstatements implements IfFeatureStatement { - RegularIfFeatureStatement(final @NonNull String rawArgument, final @NonNull IfFeatureExpr argument, +public final class RegularIfFeatureStatement extends WithSubstatements implements IfFeatureStatement { + public RegularIfFeatureStatement(final @NonNull String rawArgument, final @NonNull IfFeatureExpr argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularIncludeStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIncludeStatement.java similarity index 74% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularIncludeStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIncludeStatement.java index 1fd91a5c64..78c9c1f263 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularIncludeStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularIncludeStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IncludeStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; -final class RegularIncludeStatement extends WithSubstatements implements IncludeStatement { - RegularIncludeStatement(final String rawArgument, final String argument, +public final class RegularIncludeStatement extends WithSubstatements implements IncludeStatement { + public RegularIncludeStatement(final String rawArgument, final String argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularInputStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularInputStatement.java similarity index 79% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularInputStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularInputStatement.java index dbb3827af5..538ef728be 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularInputStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularInputStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.InputStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -class RegularInputStatement extends WithSubstatements implements InputStatement { - RegularInputStatement(final QName argument, +public class RegularInputStatement extends WithSubstatements implements InputStatement { + public RegularInputStatement(final QName argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularKeyStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularKeyStatement.java similarity index 80% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularKeyStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularKeyStatement.java index d6b5352ded..364a8890c3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularKeyStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularKeyStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.Collection; @@ -14,10 +14,10 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; -final class RegularKeyStatement extends AbstractKeyStatement { +public final class RegularKeyStatement extends AbstractKeyStatement { private final @NonNull Object substatements; - RegularKeyStatement(final @NonNull String rawArgument, final @NonNull Set argument, + public RegularKeyStatement(final @NonNull String rawArgument, final @NonNull Set argument, final ImmutableList> substatements) { super(rawArgument, argument); this.substatements = maskList(substatements); diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularLeafListStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLeafListStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularLeafListStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLeafListStatement.java index f76d50c829..e529cce274 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularLeafListStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLeafListStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.LeafListStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularLeafListStatement extends WithSubstatements implements LeafListStatement { - RegularLeafListStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularLeafListStatement extends WithSubstatements implements LeafListStatement { + public RegularLeafListStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularLeafStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLeafStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularLeafStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLeafStatement.java index dca030a6cf..db0dc7488a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularLeafStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLeafStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.LeafStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularLeafStatement extends WithSubstatements implements LeafStatement { - RegularLeafStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularLeafStatement extends WithSubstatements implements LeafStatement { + public RegularLeafStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularLengthStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLengthStatement.java similarity index 75% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularLengthStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLengthStatement.java index aba27dfd4a..12973a36ee 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularLengthStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularLengthStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.List; @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.LengthStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ValueRange; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; -final class RegularLengthStatement extends WithSubstatements> implements LengthStatement { - RegularLengthStatement(final String rawArgument, final List argument, +public final class RegularLengthStatement extends WithSubstatements> implements LengthStatement { + public RegularLengthStatement(final String rawArgument, final List argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularListStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularListStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularListStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularListStatement.java index ae7372f743..52890a8123 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularListStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularListStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ListStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularListStatement extends WithSubstatements implements ListStatement { - RegularListStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularListStatement extends WithSubstatements implements ListStatement { + public RegularListStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularMandatoryStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMandatoryStatement.java similarity index 75% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularMandatoryStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMandatoryStatement.java index 9de19731ef..f980a142af 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularMandatoryStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMandatoryStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString.WithSubstatements; -final class RegularMandatoryStatement extends WithSubstatements implements MandatoryStatement { - RegularMandatoryStatement(final Boolean argument, +public final class RegularMandatoryStatement extends WithSubstatements implements MandatoryStatement { + public RegularMandatoryStatement(final Boolean argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularMaxElementsStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMaxElementsStatement.java similarity index 73% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularMaxElementsStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMaxElementsStatement.java index 3f03d79af9..f04dd86467 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularMaxElementsStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMaxElementsStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MaxElementsStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; -final class RegularMaxElementsStatement extends WithSubstatements implements MaxElementsStatement { - RegularMaxElementsStatement(final String rawArgument, final String argument, +public final class RegularMaxElementsStatement extends WithSubstatements implements MaxElementsStatement { + public RegularMaxElementsStatement(final String rawArgument, final String argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularMinElementsStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMinElementsStatement.java similarity index 75% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularMinElementsStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMinElementsStatement.java index b26545336e..98266ebed1 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularMinElementsStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMinElementsStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MinElementsStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString.WithSubstatements; -final class RegularMinElementsStatement extends WithSubstatements implements MinElementsStatement { - RegularMinElementsStatement(final Integer argument, +public final class RegularMinElementsStatement extends WithSubstatements implements MinElementsStatement { + public RegularMinElementsStatement(final Integer argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularModifierStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularModifierStatement.java similarity index 77% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularModifierStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularModifierStatement.java index 0ca17b181e..0ca9903f16 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularModifierStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularModifierStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ModifierStatement; import org.opendaylight.yangtools.yang.model.api.type.ModifierKind; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; -final class RegularModifierStatement extends WithSubstatements implements ModifierStatement { - RegularModifierStatement(final ModifierKind argument, +public final class RegularModifierStatement extends WithSubstatements implements ModifierStatement { + public RegularModifierStatement(final ModifierKind argument, final ImmutableList> substatements) { super(argument.getKeyword(), argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularMustStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMustStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularMustStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMustStatement.java index 4cab2542cd..fb3cde4064 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularMustStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularMustStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.MustStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBound; -final class RegularMustStatement extends WithSubstatements implements MustStatement { - RegularMustStatement(final String rawArgument, final QualifiedBound argument, +public final class RegularMustStatement extends WithSubstatements implements MustStatement { + public RegularMustStatement(final String rawArgument, final QualifiedBound argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularNamespaceStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularNamespaceStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularNamespaceStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularNamespaceStatement.java index 55b6629be1..93dbb1b94f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularNamespaceStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularNamespaceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.XMLNamespace; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString.WithSubstatements; -final class RegularNamespaceStatement extends WithSubstatements implements NamespaceStatement { - RegularNamespaceStatement(final XMLNamespace argument, +public final class RegularNamespaceStatement extends WithSubstatements implements NamespaceStatement { + public RegularNamespaceStatement(final XMLNamespace argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularNotificationStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularNotificationStatement.java similarity index 77% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularNotificationStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularNotificationStatement.java index 38c02769f8..5e08d7ce7d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularNotificationStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularNotificationStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.NotificationStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularNotificationStatement extends WithSubstatements implements NotificationStatement { - RegularNotificationStatement(final QName argument, +public final class RegularNotificationStatement extends WithSubstatements implements NotificationStatement { + public RegularNotificationStatement(final QName argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularOrderedByStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOrderedByStatement.java similarity index 81% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularOrderedByStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOrderedByStatement.java index 2b59967de7..7b32869a13 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularOrderedByStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOrderedByStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.Collection; @@ -13,10 +13,10 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.Ordering; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; -final class RegularOrderedByStatement extends AbstractOrderedByStatement { +public final class RegularOrderedByStatement extends AbstractOrderedByStatement { private final @NonNull Object substatements; - RegularOrderedByStatement(final Ordering argument, + public RegularOrderedByStatement(final Ordering argument, final ImmutableList> substatements) { super(argument); this.substatements = maskList(substatements); diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularOrganizationStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOrganizationStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularOrganizationStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOrganizationStatement.java index c3a967e03b..f06402333a 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularOrganizationStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOrganizationStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OrganizationStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -final class RegularOrganizationStatement extends WithSubstatements implements OrganizationStatement { - RegularOrganizationStatement(final @NonNull String rawArgument, +public final class RegularOrganizationStatement extends WithSubstatements implements OrganizationStatement { + public RegularOrganizationStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { super(rawArgument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularOutputStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOutputStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularOutputStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOutputStatement.java index b4e29e84f3..4e75c8027d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularOutputStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularOutputStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OutputStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -class RegularOutputStatement extends WithSubstatements implements OutputStatement { - RegularOutputStatement(final QName argument, final ImmutableList> substatements) { +public class RegularOutputStatement extends WithSubstatements implements OutputStatement { + public RegularOutputStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPathStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPathStatement.java similarity index 82% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPathStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPathStatement.java index 396dca3fbd..88fdd73e2e 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPathStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPathStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.Collection; @@ -13,10 +13,10 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.PathExpression; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; -final class RegularPathStatement extends EmptyPathStatement { +public final class RegularPathStatement extends EmptyPathStatement { private final @NonNull Object substatements; - RegularPathStatement(final PathExpression argument, + public RegularPathStatement(final PathExpression argument, final ImmutableList> substatements) { super(argument); this.substatements = maskList(substatements); diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPatternStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPatternStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPatternStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPatternStatement.java index d1aae2b4f8..5313b77cf4 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPatternStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPatternStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.PatternExpression; import org.opendaylight.yangtools.yang.model.api.stmt.PatternStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString.WithSubstatements; -final class RegularPatternStatement extends WithSubstatements implements PatternStatement { - RegularPatternStatement(final PatternExpression argument, +public final class RegularPatternStatement extends WithSubstatements implements PatternStatement { + public RegularPatternStatement(final PatternExpression argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPositionStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPositionStatement.java similarity index 77% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPositionStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPositionStatement.java index 11aca4746a..87495d6a9d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPositionStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPositionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.Uint32; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PositionStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString.WithSubstatements; -final class RegularPositionStatement extends WithSubstatements implements PositionStatement { - RegularPositionStatement(final Uint32 argument, +public final class RegularPositionStatement extends WithSubstatements implements PositionStatement { + public RegularPositionStatement(final Uint32 argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPrefixStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPrefixStatement.java similarity index 77% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPrefixStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPrefixStatement.java index 4b8d9d0971..2068b88409 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPrefixStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPrefixStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -final class RegularPrefixStatement extends WithSubstatements implements PrefixStatement { - RegularPrefixStatement(final @NonNull String rawArgument, +public final class RegularPrefixStatement extends WithSubstatements implements PrefixStatement { + public RegularPrefixStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { super(rawArgument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPresenceStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPresenceStatement.java similarity index 77% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPresenceStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPresenceStatement.java index 34abda3e7e..28a3621ae5 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularPresenceStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularPresenceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PresenceStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -final class RegularPresenceStatement extends WithSubstatements implements PresenceStatement { - RegularPresenceStatement(final @NonNull String rawArgument, +public final class RegularPresenceStatement extends WithSubstatements implements PresenceStatement { + public RegularPresenceStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { super(rawArgument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRangeStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRangeStatement.java similarity index 75% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRangeStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRangeStatement.java index 635a7d99ec..138721e06d 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRangeStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRangeStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.List; @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.RangeStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ValueRange; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; -final class RegularRangeStatement extends WithSubstatements> implements RangeStatement { - RegularRangeStatement(final String rawArgument, final List argument, +public final class RegularRangeStatement extends WithSubstatements> implements RangeStatement { + public RegularRangeStatement(final String rawArgument, final List argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularReferenceStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularReferenceStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularReferenceStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularReferenceStatement.java index ae23b60d6c..98cc10fb96 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularReferenceStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularReferenceStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -final class RegularReferenceStatement extends WithSubstatements implements ReferenceStatement { - RegularReferenceStatement(final @NonNull String rawArgument, +public final class RegularReferenceStatement extends WithSubstatements implements ReferenceStatement { + public RegularReferenceStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { super(rawArgument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRequireInstanceStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRequireInstanceStatement.java similarity index 74% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRequireInstanceStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRequireInstanceStatement.java index 69d4c5078e..0c9c2fda61 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRequireInstanceStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRequireInstanceStatement.java @@ -5,15 +5,16 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString.WithSubstatements; -final class RegularRequireInstanceStatement extends WithSubstatements implements RequireInstanceStatement { - RegularRequireInstanceStatement(final Boolean argument, +public final class RegularRequireInstanceStatement extends WithSubstatements + implements RequireInstanceStatement { + public RegularRequireInstanceStatement(final Boolean argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRevisionDateStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRevisionDateStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRevisionDateStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRevisionDateStatement.java index b8f28e789a..570e21abf0 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRevisionDateStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRevisionDateStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.Revision; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RevisionDateStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString.WithSubstatements; -final class RegularRevisionDateStatement extends WithSubstatements implements RevisionDateStatement { - RegularRevisionDateStatement(final Revision argument, +public final class RegularRevisionDateStatement extends WithSubstatements implements RevisionDateStatement { + public RegularRevisionDateStatement(final Revision argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRevisionStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRevisionStatement.java similarity index 77% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRevisionStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRevisionStatement.java index 80713f89d0..71aae5d2ec 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRevisionStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRevisionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.Revision; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RevisionStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString.WithSubstatements; -final class RegularRevisionStatement extends WithSubstatements implements RevisionStatement { - RegularRevisionStatement(final Revision argument, +public final class RegularRevisionStatement extends WithSubstatements implements RevisionStatement { + public RegularRevisionStatement(final Revision argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRpcStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRpcStatement.java similarity index 71% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRpcStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRpcStatement.java index c66a91602d..05f86fdc1f 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularRpcStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularRpcStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RpcStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularRpcStatement extends WithSubstatements implements RpcStatement { - RegularRpcStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularRpcStatement extends WithSubstatements implements RpcStatement { + public RegularRpcStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularStatusStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularStatusStatement.java similarity index 75% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularStatusStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularStatusStatement.java index 6c1634e237..5220bd4499 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularStatusStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularStatusStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.Collection; @@ -13,10 +13,11 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; -final class RegularStatusStatement extends AbstractStatusStatement { +public final class RegularStatusStatement extends AbstractStatusStatement { private final @NonNull Object substatements; - RegularStatusStatement(final Status argument, final ImmutableList> substatements) { + public RegularStatusStatement(final Status argument, + final ImmutableList> substatements) { super(argument); this.substatements = maskList(substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularTypeStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularTypeStatement.java similarity index 77% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularTypeStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularTypeStatement.java index 4a511ace90..dec24c42ba 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularTypeStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularTypeStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -final class RegularTypeStatement extends WithSubstatements implements TypeStatement { - RegularTypeStatement(final String rawArgument, +public final class RegularTypeStatement extends WithSubstatements implements TypeStatement { + public RegularTypeStatement(final String rawArgument, final ImmutableList> substatements) { super(rawArgument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularTypedefStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularTypedefStatement.java similarity index 70% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularTypedefStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularTypedefStatement.java index a4e3f0e729..b5092519b5 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularTypedefStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularTypedefStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements; -final class RegularTypedefStatement extends WithSubstatements implements TypedefStatement { - RegularTypedefStatement(final QName argument, final ImmutableList> substatements) { +public final class RegularTypedefStatement extends WithSubstatements implements TypedefStatement { + public RegularTypedefStatement(final QName argument, + final ImmutableList> substatements) { super(argument, substatements); } } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUndeclaredInputStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUndeclaredInputStatement.java similarity index 78% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUndeclaredInputStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUndeclaredInputStatement.java index 80c9821b5b..7cbb024cd3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUndeclaredInputStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUndeclaredInputStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.StatementSource; -final class RegularUndeclaredInputStatement extends RegularInputStatement { - RegularUndeclaredInputStatement(final QName argument, +public final class RegularUndeclaredInputStatement extends RegularInputStatement { + public RegularUndeclaredInputStatement(final QName argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUndeclaredOutputStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUndeclaredOutputStatement.java similarity index 78% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUndeclaredOutputStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUndeclaredOutputStatement.java index 2095dc4de7..ca2bc446be 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUndeclaredOutputStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUndeclaredOutputStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.StatementSource; -final class RegularUndeclaredOutputStatement extends RegularOutputStatement { - RegularUndeclaredOutputStatement(final QName argument, +public final class RegularUndeclaredOutputStatement extends RegularOutputStatement { + public RegularUndeclaredOutputStatement(final QName argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUniqueStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUniqueStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUniqueStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUniqueStatement.java index b9f87bb541..28ad3f4123 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUniqueStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUniqueStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import java.util.Set; @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Desce import org.opendaylight.yangtools.yang.model.api.stmt.UniqueStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; -final class RegularUniqueStatement extends WithSubstatements> implements UniqueStatement { - RegularUniqueStatement(final String rawArgument, final Set argument, +public final class RegularUniqueStatement extends WithSubstatements> implements UniqueStatement { + public RegularUniqueStatement(final String rawArgument, final Set argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUnitsStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUnitsStatement.java similarity index 77% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUnitsStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUnitsStatement.java index f9a116c002..9b806ee348 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUnitsStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUnitsStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.eclipse.jdt.annotation.NonNull; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnitsStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithRawStringArgument.WithSubstatements; -final class RegularUnitsStatement extends WithSubstatements implements UnitsStatement { - RegularUnitsStatement(final @NonNull String rawArgument, +public final class RegularUnitsStatement extends WithSubstatements implements UnitsStatement { + public RegularUnitsStatement(final @NonNull String rawArgument, final ImmutableList> substatements) { super(rawArgument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUsesStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUsesStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUsesStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUsesStatement.java index c0ce081b00..ab3d1d24b3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularUsesStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularUsesStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.QName; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UsesStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; -final class RegularUsesStatement extends WithSubstatements implements UsesStatement { - RegularUsesStatement(final String rawArgument, final QName argument, +public final class RegularUsesStatement extends WithSubstatements implements UsesStatement { + public RegularUsesStatement(final String rawArgument, final QName argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularValueStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularValueStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularValueStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularValueStatement.java index 58b2fb25a4..db7be82dd8 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularValueStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularValueStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ValueStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString.WithSubstatements; -final class RegularValueStatement extends WithSubstatements implements ValueStatement { - RegularValueStatement(final Integer argument, +public final class RegularValueStatement extends WithSubstatements implements ValueStatement { + public RegularValueStatement(final Integer argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularWhenStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularWhenStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularWhenStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularWhenStatement.java index c5e1c7537b..2c186abc23 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularWhenStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularWhenStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.WhenStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.WithArgument.WithSubstatements; import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBound; -final class RegularWhenStatement extends WithSubstatements implements WhenStatement { - RegularWhenStatement(final String rawArgument, final QualifiedBound argument, +public final class RegularWhenStatement extends WithSubstatements implements WhenStatement { + public RegularWhenStatement(final String rawArgument, final QualifiedBound argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularYangVersionStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularYangVersionStatement.java similarity index 76% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularYangVersionStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularYangVersionStatement.java index 9dcd2d1c00..c004aa36c1 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularYangVersionStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularYangVersionStatement.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.YangVersion; @@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString.WithSubstatements; -final class RegularYangVersionStatement extends WithSubstatements implements YangVersionStatement { - RegularYangVersionStatement(final YangVersion argument, +public final class RegularYangVersionStatement extends WithSubstatements implements YangVersionStatement { + public RegularYangVersionStatement(final YangVersion argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularYinElementStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularYinElementStatement.java similarity index 75% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularYinElementStatement.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularYinElementStatement.java index 074ab1d1a4..5ae54d47d3 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/RegularYinElementStatement.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/RegularYinElementStatement.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YinElementStatement; import org.opendaylight.yangtools.yang.model.spi.meta.AbstractDeclaredStatement.ArgumentToString.WithSubstatements; -final class RegularYinElementStatement extends WithSubstatements implements YinElementStatement { - RegularYinElementStatement(final Boolean argument, +public final class RegularYinElementStatement extends WithSubstatements implements YinElementStatement { + public RegularYinElementStatement(final Boolean argument, final ImmutableList> substatements) { super(argument, substatements); } diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/SubmoduleStatementImpl.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/SubmoduleStatementImpl.java similarity index 73% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/SubmoduleStatementImpl.java rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/SubmoduleStatementImpl.java index f203198bf2..860cffe6f1 100644 --- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/SubmoduleStatementImpl.java +++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/stmt/impl/decl/SubmoduleStatementImpl.java @@ -5,16 +5,16 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.model.spi.stmt; +package org.opendaylight.yangtools.yang.model.spi.stmt.impl.decl; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.yang.common.UnqualifiedQName; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SubmoduleStatement; -final class SubmoduleStatementImpl extends AbstractDeclaredEffectiveRootStatement +public final class SubmoduleStatementImpl extends AbstractDeclaredEffectiveRootStatement implements SubmoduleStatement { - SubmoduleStatementImpl(final String rawArgument, final UnqualifiedQName argument, + public SubmoduleStatementImpl(final String rawArgument, final UnqualifiedQName argument, final ImmutableList> substatements) { super(rawArgument, argument, substatements); }