From f62d6a392af10482324af39b23b2766ad1aa23f4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 23 Aug 2019 13:49:04 +0200 Subject: [PATCH] Simplify GET_SCHEMAS_RPC initialization There is no need for static initializer, as we are using a simple builder. Change-Id: I55bbb8e54ee2df436ec242373739ca6aba1dc03d Signed-off-by: Robert Varga --- .../sal/connect/netconf/NetconfStateSchemas.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java index 06765305f4..913993b9cd 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java @@ -67,14 +67,10 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { private static final YangInstanceIdentifier STATE_SCHEMAS_IDENTIFIER = YangInstanceIdentifier.builder().node(NetconfState.QNAME).node(Schemas.QNAME).build(); - private static final ContainerNode GET_SCHEMAS_RPC; - - static { - final DataContainerChild filter = NetconfMessageTransformUtil.toFilterStructure(STATE_SCHEMAS_IDENTIFIER, - BaseSchema.BASE_NETCONF_CTX_WITH_NOTIFICATIONS.getSchemaContext()); - GET_SCHEMAS_RPC - = Builders.containerBuilder().withNodeIdentifier(NETCONF_GET_NODEID).withChild(filter).build(); - } + private static final ContainerNode GET_SCHEMAS_RPC = Builders.containerBuilder() + .withNodeIdentifier(NETCONF_GET_NODEID) + .withChild(NetconfMessageTransformUtil.toFilterStructure(STATE_SCHEMAS_IDENTIFIER, + BaseSchema.BASE_NETCONF_CTX_WITH_NOTIFICATIONS.getSchemaContext())).build(); private final Set availableYangSchemas; -- 2.36.6