X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-spi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fbroker%2Fspi%2Frpc%2FRpcRoutingStrategy.java;h=f55cb87e51b6c786337fe1288150fa7aaa576b87;hp=0f8d2a70e31afc072bee7320eff8eee047c28a03;hb=4ad8e1880cfee424eac9e4f12e461d98445a6e44;hpb=3ec97cd0a86ad1b79f6854dc6924eb7b06e359a3 diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java index 0f8d2a70e3..f55cb87e51 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java @@ -7,8 +7,10 @@ */ package org.opendaylight.controller.md.sal.dom.broker.spi.rpc; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; -import com.google.common.base.Preconditions; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -18,13 +20,13 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @Deprecated public abstract class RpcRoutingStrategy implements Identifiable { - private static final QName CONTEXT_REFERENCE = QName.create("urn:opendaylight:yang:extension:yang-ext", "2013-07-09", "context-reference").intern(); + private final QName identifier; private RpcRoutingStrategy(final QName identifier) { - this.identifier = Preconditions.checkNotNull(identifier); + this.identifier = requireNonNull(identifier); } /** @@ -70,6 +72,7 @@ public abstract class RpcRoutingStrategy implements Identifiable { return new GlobalRpcStrategy(rpc.getQName()); } + @SuppressModernizer public static Optional getRoutingContext(final DataSchemaNode schemaNode) { for (UnknownSchemaNode extension : schemaNode.getUnknownSchemaNodes()) { if (CONTEXT_REFERENCE.equals(extension.getNodeType())) { @@ -85,8 +88,8 @@ public abstract class RpcRoutingStrategy implements Identifiable { private RoutedRpcStrategy(final QName identifier, final QName ctx, final QName leaf) { super(identifier); - this.context = Preconditions.checkNotNull(ctx); - this.leaf = Preconditions.checkNotNull(leaf); + this.context = requireNonNull(ctx); + this.leaf = requireNonNull(leaf); } @Override @@ -106,7 +109,6 @@ public abstract class RpcRoutingStrategy implements Identifiable { } private static final class GlobalRpcStrategy extends RpcRoutingStrategy { - GlobalRpcStrategy(final QName identifier) { super(identifier); }