From: Robert Varga Date: Thu, 2 Jul 2020 17:38:04 +0000 (+0200) Subject: Consolidate BinaryTypeEffectiveStatementImpl X-Git-Tag: v5.0.4~36 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=489cf7422d0b5155b6105151ae24e3aeac512bfb;p=yangtools.git Consolidate BinaryTypeEffectiveStatementImpl Derived TypeEffectiveStatements follow an obvious pattern, where we do not need to have specialized subclasses for each of them. Introduce TypeEffectiveStatementImpl and migrate 'type binary' to use it. JIRA: YANGTOOLS-1065 Change-Id: I16c259718c3502d85ad0e77c5f612eb9d601d979 Signed-off-by: Robert Varga --- diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java index 517043be80..f2d4ddb3f7 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java @@ -19,6 +19,7 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.YangStmtMapping; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.LengthEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefEffectiveStatement; @@ -42,6 +43,8 @@ import org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.Uint64TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; +import org.opendaylight.yangtools.yang.model.util.type.InvalidLengthConstraintException; +import org.opendaylight.yangtools.yang.model.util.type.LengthRestrictedTypeBuilder; import org.opendaylight.yangtools.yang.model.util.type.RestrictedTypes; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace; @@ -204,7 +207,7 @@ abstract class AbstractTypeStatementSupport } @Override - protected final EffectiveStatement createEffective( + protected final TypeEffectiveStatement createEffective( final StmtContext> ctx, final TypeStatement declared, final ImmutableList> substatements) { // First look up the proper base type @@ -212,7 +215,7 @@ abstract class AbstractTypeStatementSupport // Now instantiate the proper effective statement for that type final TypeDefinition baseType = typeStmt.getTypeDefinition(); if (baseType instanceof BinaryTypeDefinition) { - return new BinaryTypeEffectiveStatementImpl(ctx, (BinaryTypeDefinition) baseType); + return createBinary(ctx, (BinaryTypeDefinition) baseType, declared, substatements); } else if (baseType instanceof BitsTypeDefinition) { return new BitsTypeEffectiveStatementImpl(ctx, (BitsTypeDefinition) baseType); } else if (baseType instanceof BooleanTypeDefinition) { @@ -324,4 +327,29 @@ abstract class AbstractTypeStatementSupport return typedef.buildEffective().asTypeEffectiveStatement(); } } + + private static @NonNull TypeEffectiveStatement createBinary(final StmtContext ctx, + final BinaryTypeDefinition baseType, final TypeStatement declared, + final ImmutableList> substatements) { + final LengthRestrictedTypeBuilder builder = + RestrictedTypes.newBinaryBuilder(baseType, typeEffectiveSchemaPath(ctx)); + + for (EffectiveStatement stmt : substatements) { + if (stmt instanceof LengthEffectiveStatement) { + final LengthEffectiveStatement length = (LengthEffectiveStatement)stmt; + + try { + builder.setLengthConstraint(length, length.argument()); + } catch (IllegalStateException e) { + throw new SourceException(ctx.getStatementSourceReference(), e, + "Multiple length constraints encountered"); + } catch (InvalidLengthConstraintException e) { + throw new SourceException(ctx.getStatementSourceReference(), e, "Invalid length constraint %s", + length.argument()); + } + } + } + + return new TypeEffectiveStatementImpl<>(declared, substatements, builder); + } } \ No newline at end of file diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BinaryTypeEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BinaryTypeEffectiveStatementImpl.java deleted file mode 100644 index 23755afdd1..0000000000 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BinaryTypeEffectiveStatementImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type; - -import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.LengthEffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; -import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition; -import org.opendaylight.yangtools.yang.model.util.type.InvalidLengthConstraintException; -import org.opendaylight.yangtools.yang.model.util.type.LengthRestrictedTypeBuilder; -import org.opendaylight.yangtools.yang.model.util.type.RestrictedTypes; -import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.DeclaredEffectiveStatementBase; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; - -final class BinaryTypeEffectiveStatementImpl extends DeclaredEffectiveStatementBase - implements TypeEffectiveStatement { - private final @NonNull BinaryTypeDefinition typeDefinition; - - BinaryTypeEffectiveStatementImpl( - final StmtContext> ctx, - final BinaryTypeDefinition baseType) { - super(ctx); - - final LengthRestrictedTypeBuilder builder = - RestrictedTypes.newBinaryBuilder(baseType, AbstractTypeStatementSupport.typeEffectiveSchemaPath(ctx)); - - for (EffectiveStatement stmt : effectiveSubstatements()) { - if (stmt instanceof LengthEffectiveStatement) { - final LengthEffectiveStatement length = (LengthEffectiveStatement)stmt; - - try { - builder.setLengthConstraint(length, length.argument()); - } catch (IllegalStateException e) { - throw new SourceException(ctx.getStatementSourceReference(), e, - "Multiple length constraints encountered"); - } catch (InvalidLengthConstraintException e) { - throw new SourceException(ctx.getStatementSourceReference(), e, "Invalid length constraint %s", - length.argument()); - } - } - - if (stmt instanceof UnknownSchemaNode) { - builder.addUnknownSchemaNode((UnknownSchemaNode)stmt); - } - } - - typeDefinition = builder.build(); - } - - @Override - public BinaryTypeDefinition getTypeDefinition() { - return typeDefinition; - } -} diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java new file mode 100644 index 0000000000..64c14a8ee9 --- /dev/null +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2020 PANTHEON.tech, s.r.o. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type; + +import com.google.common.collect.ImmutableList; +import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.yangtools.yang.model.api.TypeDefinition; +import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement; +import org.opendaylight.yangtools.yang.model.util.type.TypeBuilder; +import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredEffectiveStatement.DefaultArgument.WithSubstatements; + +final class TypeEffectiveStatementImpl> extends WithSubstatements + implements TypeEffectiveStatement { + private final @NonNull T typeDefinition; + + TypeEffectiveStatementImpl(final TypeStatement declared, + final ImmutableList> substatements, final TypeBuilder builder) { + super(declared, substatements); + + for (EffectiveStatement stmt : substatements) { + if (stmt instanceof UnknownSchemaNode) { + builder.addUnknownSchemaNode((UnknownSchemaNode)stmt); + } + } + typeDefinition = builder.build(); + } + + @Override + public T getTypeDefinition() { + return typeDefinition; + } +}