From 8fe9ec767ec28d41f55e9714ca69fe08e64f71f0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 28 Mar 2019 08:48:02 +0100 Subject: [PATCH] Hide NormalizedNodeBuilderWrapper This class is not instantiable outside of the package is it does not leak from NormalizedNodePruner -- therefore it cannot be used by anyone else. Make sure it's package-private and clean it up a bit. JIRA: CONTROLLER-1887 Change-Id: I17911508273d68c2795d38e2156c9407522f55fe Signed-off-by: Robert Varga --- .../NormalizedNodeBuilderWrapper.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodeBuilderWrapper.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodeBuilderWrapper.java index 4654ec9cc1..e39e012ff9 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodeBuilderWrapper.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodeBuilderWrapper.java @@ -5,41 +5,40 @@ * 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.controller.cluster.datastore.node.utils.transformer; import com.google.common.base.Optional; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextNode; -public class NormalizedNodeBuilderWrapper { - private final NormalizedNodeContainerBuilder builder; - private final YangInstanceIdentifier.PathArgument identifier; +final class NormalizedNodeBuilderWrapper { + private final NormalizedNodeContainerBuilder builder; + private final PathArgument identifier; private final Optional> schemaNode; - NormalizedNodeBuilderWrapper(NormalizedNodeContainerBuilder builder, - YangInstanceIdentifier.PathArgument identifier, Optional> schemaNode) { + NormalizedNodeBuilderWrapper(final NormalizedNodeContainerBuilder builder, + final PathArgument identifier, final Optional> schemaNode) { this.builder = builder; this.identifier = identifier; this.schemaNode = schemaNode; } @SuppressWarnings("rawtypes") - public NormalizedNodeContainerBuilder builder() { + NormalizedNodeContainerBuilder builder() { return builder; } - public QName nodeType() { + QName nodeType() { return identifier.getNodeType(); } - public YangInstanceIdentifier.PathArgument identifier() { + PathArgument identifier() { return identifier; } - public Optional> getSchema() { + Optional> getSchema() { return schemaNode; } } -- 2.36.6