X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2Fmessages%2FExecuteAction.java;h=4fb9c614298799f82167dc745ad4485eca201c49;hp=977734bec5137f81d0018f490e67d2a3d4d1a049;hb=21b4ad7390d58ce9b88fa0a61779cfffc39e62fa;hpb=621c7bcc1ee00ed08252c110964d97b2fce93a12 diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteAction.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteAction.java index 977734bec5..4fb9c61429 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteAction.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteAction.java @@ -18,16 +18,14 @@ import java.io.ObjectOutput; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; -import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataInput; import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataOutput; import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion; -import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.SchemaPath; -public final class ExecuteAction extends AbstractExecute { +public final class ExecuteAction extends AbstractExecute<@NonNull ContainerNode> { private static final long serialVersionUID = 1128904894827335676L; private final @NonNull DOMDataTreeIdentifier path; @@ -89,11 +87,7 @@ public final class ExecuteAction extends AbstractExecute { final SchemaPath name = stream.readSchemaPath(); final LogicalDatastoreType type = LogicalDatastoreType.readFrom(in); final YangInstanceIdentifier path = stream.readYangInstanceIdentifier(); - ContainerNode input = (ContainerNode) stream.readOptionalNormalizedNode().orElse(null); - if (input == null) { - input = ImmutableNodes.containerNode( - YangConstants.operationInputQName(name.getLastComponent().getModule())); - } + final ContainerNode input = (ContainerNode) stream.readOptionalNormalizedNode().orElse(null); executeAction = new ExecuteAction(name, new DOMDataTreeIdentifier(type, path), input); }