From 1529990dd8d1f73fe061fdef1f7df81691a012e2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 13 Jul 2018 12:12:05 +0200 Subject: [PATCH] Tag RPC input/output classes with RpcInput/RpcOutput These interfaces are not just plain DataObjects, they have a specialized meaning. This meaning was not useful when RpcInput was a DataContainer, but with it being a DataObject, we can do better. Change-Id: Ieaa7e006fe73784486931c30a9b258f20fed4e79 Signed-off-by: Robert Varga --- .../binding/generator/impl/AbstractTypeGenerator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java index b0d8f27aa8..216dd4e188 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java @@ -498,9 +498,9 @@ abstract class AbstractTypeGenerator { method.addAnnotation("javax.annotation", "CheckReturnValue"); addComment(method, rpc); method.addParameter( - createRpcContainer(context, rpcName, rpc, verifyNotNull(rpc.getInput())), "input"); + createRpcContainer(context, rpcName, rpc, verifyNotNull(rpc.getInput()), RPC_INPUT), "input"); method.setReturnType(listenableFutureTypeFor( - rpcResult(createRpcContainer(context, rpcName, rpc, verifyNotNull(rpc.getOutput()))))); + rpcResult(createRpcContainer(context, rpcName, rpc, verifyNotNull(rpc.getOutput()), RPC_OUTPUT)))); } } @@ -508,13 +508,13 @@ abstract class AbstractTypeGenerator { } private Type createRpcContainer(final ModuleContext context, final String rpcName, final RpcDefinition rpc, - final ContainerSchemaNode schema) { + final ContainerSchemaNode schema, final Type type) { processUsesAugments(schema, context); final GeneratedTypeBuilder outType = addRawInterfaceDefinition( JavaTypeName.create(context.modulePackageName(), rpcName + BindingMapping.getClassName(schema.getQName())), schema); addImplementedInterfaceFromUses(schema, outType); - outType.addImplementsType(DATA_OBJECT); + outType.addImplementsType(type); outType.addImplementsType(augmentable(outType)); annotateDeprecatedIfNecessary(rpc.getStatus(), outType); resolveDataSchemaNodes(context, outType, outType, schema.getChildNodes()); -- 2.36.6