Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "AbstractConfigTest - exposed BundleContext and ServiceRegistration mock."
[controller.git]
/
opendaylight
/
md-sal
/
sal-binding-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
binding
/
codegen
/
impl
/
RpcRouterCodegenInstance.xtend
diff --git
a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/RpcRouterCodegenInstance.xtend
b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/RpcRouterCodegenInstance.xtend
index f63f2a313ef58375e95d165f4b5823b504cda3d4..b6dcde19ee18a4ae3e05571b6c56e448d50c1794 100644
(file)
--- a/
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/RpcRouterCodegenInstance.xtend
+++ b/
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/RpcRouterCodegenInstance.xtend
@@
-8,8
+8,8
@@
import static extension org.opendaylight.controller.sal.binding.codegen.RuntimeC
import java.util.Set
import java.util.HashMap
import org.opendaylight.controller.sal.binding.spi.RpcRoutingTable
import java.util.Set
import java.util.HashMap
import org.opendaylight.controller.sal.binding.spi.RpcRoutingTable
-import org.opendaylight.yangtools.yang.binding.Data
Object
-import
static org.opendaylight.controller.sal.binding.codegen.impl.XtendHelper.*
+import org.opendaylight.yangtools.yang.binding.Data
Container
+import
org.opendaylight.yangtools.yang.binding.RpcImplementation
class RpcRouterCodegenInstance<T extends RpcService> implements RpcRouter<T> {
class RpcRouterCodegenInstance<T extends RpcService> implements RpcRouter<T> {
@@
-17,20
+17,29
@@
class RpcRouterCodegenInstance<T extends RpcService> implements RpcRouter<T> {
val T invocationProxy
@Property
val T invocationProxy
@Property
- val Class<T> rpcServiceType
+ val RpcImplementation invokerDelegate;
+
+ @Property
+ val Class<T> serviceType
@Property
val Set<Class<? extends BaseIdentity>> contexts
@Property
val Set<Class<? extends BaseIdentity>> contexts
- val routingTables = new HashMap<Class<? extends BaseIdentity>, RpcRoutingTableImpl<? extends BaseIdentity, ?>>;
+ @Property
+ val Set<Class<? extends DataContainer>> supportedInputs;
+
+ val routingTables = new HashMap<Class<? extends BaseIdentity>, RpcRoutingTableImpl<? extends BaseIdentity, ? extends RpcService>>;
@Property
var T defaultService
@Property
var T defaultService
- new(Class<T> type, T routerImpl, Set<Class<? extends BaseIdentity>> contexts) {
- _rpcServiceType = type
+ new(Class<T> type, T routerImpl, Set<Class<? extends BaseIdentity>> contexts,
+ Set<Class<? extends DataContainer>> inputs) {
+ _serviceType = type
_invocationProxy = routerImpl
_invocationProxy = routerImpl
+ _invokerDelegate = routerImpl as RpcImplementation
_contexts = contexts
_contexts = contexts
+ _supportedInputs = inputs;
for (ctx : contexts) {
val table = XtendHelper.createRoutingTable(ctx)
for (ctx : contexts) {
val table = XtendHelper.createRoutingTable(ctx)
@@
-47,4
+56,9
@@
class RpcRouterCodegenInstance<T extends RpcService> implements RpcRouter<T> {
val table = getRoutingTable(context);
return table.getRoute(path);
}
val table = getRoutingTable(context);
return table.getRoute(path);
}
+
+ override <T extends DataContainer> invoke(Class<T> type, T input) {
+ return invokerDelegate.invoke(type, input);
+ }
+
}
}