From 7cfa38d3d3004105f7c8c5b04ceeebec5c2b6b67 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 18 Jan 2022 08:17:10 +0100 Subject: [PATCH 1/1] Disconnect DeclaredStatementFormatter from Builder concepts.Builder is going away, do not use it for DeclaredStatementFormatter.Builder. JIRA: YANGTOOLS-1328 Change-Id: Iaae40f9e0ce95390f67dadad881f5c137aefd403 Signed-off-by: Robert Varga --- .../yang/model/export/DeclaredStatementFormatter.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/DeclaredStatementFormatter.java b/model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/DeclaredStatementFormatter.java index e0efa40e7b..f147211fb1 100644 --- a/model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/DeclaredStatementFormatter.java +++ b/model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/DeclaredStatementFormatter.java @@ -15,6 +15,7 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.concepts.Immutable; +import org.opendaylight.yangtools.concepts.Mutable; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement; @@ -81,8 +82,7 @@ public final class DeclaredStatementFormatter implements Immutable { * Builder class for instantiation of a customized {@link DeclaredStatementFormatter}. */ @Beta - public static final class Builder - implements org.opendaylight.yangtools.concepts.Builder { + public static final class Builder implements Mutable { private final Set ignoredStatements = new HashSet<>(4); private boolean retainDefaultStatements; @@ -112,7 +112,11 @@ public final class DeclaredStatementFormatter implements Immutable { return this; } - @Override + /** + * Return a {@link DeclaredStatementFormatter} based on this builder's current state. + * + * @return A DeclaredStatementFormatter + */ public DeclaredStatementFormatter build() { return new DeclaredStatementFormatter(ImmutableSet.copyOf(ignoredStatements), !retainDefaultStatements); } -- 2.36.6