From 64e2cf9230b6c1b836c01281518d2275bf1fc4fc Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 19 Jan 2021 22:54:59 +0100
Subject: [PATCH] RPC statement should refuse to get copied

RPCs cannot be defined inside reusable constructs and therefore
they should never be copied. Use the appropriate policy.

JIRA: YANGTOOLS-1195
Change-Id: I4cbf582cac0a4865447bc3782cf1771c96d7cba3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../parser/rfc7950/stmt/BaseSchemaTreeStatementSupport.java | 6 ++++++
 .../yang/parser/rfc7950/stmt/rpc/RpcStatementSupport.java   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseSchemaTreeStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseSchemaTreeStatementSupport.java
index ea75558dc2..8145894fc7 100644
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseSchemaTreeStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseSchemaTreeStatementSupport.java
@@ -26,6 +26,12 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
  */
 public abstract class BaseSchemaTreeStatementSupport<D extends DeclaredStatement<QName>,
         E extends SchemaTreeEffectiveStatement<D>> extends AbstractQNameStatementSupport<D, E> {
+    protected BaseSchemaTreeStatementSupport(final StatementDefinition publicDefinition,
+            final StatementPolicy<QName, D> policy) {
+        super(publicDefinition, policy);
+    }
+
+    @Deprecated
     protected BaseSchemaTreeStatementSupport(final StatementDefinition publicDefinition, final CopyPolicy copyPolicy) {
         super(publicDefinition, copyPolicy);
     }
diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/RpcStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/RpcStatementSupport.java
index a532af4cdd..38380d7592 100644
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/RpcStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/RpcStatementSupport.java
@@ -60,7 +60,7 @@ public final class RpcStatementSupport extends BaseSchemaTreeStatementSupport<Rp
 
     private RpcStatementSupport(final InputStatementSupport implicitInput,
             final OutputStatementSupport implicitOutput) {
-        super(YangStmtMapping.RPC, CopyPolicy.DECLARED_COPY);
+        super(YangStmtMapping.RPC, StatementPolicy.reject());
         this.implicitInput = requireNonNull(implicitInput);
         this.implicitOutput = requireNonNull(implicitOutput);
     }
-- 
2.36.6