X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fimpl%2FBindingDOMRpcProviderServiceAdapter.java;h=1232035e033a5414a2376f28c3b524195e944717;hp=ba822989d81d8faa947db6885b9c002d46b3f054;hb=8ec73bf853a9b6708b455c0321a585992e02b125;hpb=ee04fdfc14f438a7fa6b1cd63e8756386293f6c8 diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcProviderServiceAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcProviderServiceAdapter.java index ba822989d8..1232035e03 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcProviderServiceAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcProviderServiceAdapter.java @@ -8,7 +8,11 @@ package org.opendaylight.controller.md.sal.binding.impl; import com.google.common.collect.ImmutableSet; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashSet; +import java.util.Map; import java.util.Set; import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier; import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementationRegistration; @@ -21,7 +25,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; public class BindingDOMRpcProviderServiceAdapter { - private static final Set GLOBAL = ImmutableSet.of(YangInstanceIdentifier.builder().build()); + private static final Set GLOBAL = ImmutableSet.of(YangInstanceIdentifier.EMPTY); private final BindingToNormalizedNodeCodec codec; private final DOMRpcProviderService domRpcRegistry; @@ -32,44 +36,38 @@ public class BindingDOMRpcProviderServiceAdapter { public ObjectRegistration registerRpcImplementation(final Class type, final T implementation) { - return register(type,implementation,createDomRpcIdentifiers(type,GLOBAL)); + return register(type, implementation, GLOBAL); } public ObjectRegistration registerRpcImplementation(final Class type, final T implementation, final Set> paths) { - return register(type,implementation,createDomRpcIdentifiers(type,toYangInstanceIdentifiers(paths))); + return register(type, implementation, toYangInstanceIdentifiers(paths)); } - private ObjectRegistration register(final Class type, final T implementation, final Set domRpcs) { - final BindingRpcImplementationAdapter adapter = new BindingRpcImplementationAdapter(codec.getCodecRegistry(), type, implementation); - + private ObjectRegistration register(final Class type, final T implementation, final Collection rpcContextPaths) { + final Map rpcs = codec.getRpcMethodToSchemaPath(type).inverse(); + final BindingDOMRpcImplementationAdapter adapter = new BindingDOMRpcImplementationAdapter(codec.getCodecRegistry(), type, rpcs, implementation); + final Set domRpcs = createDomRpcIdentifiers(rpcs.keySet(), rpcContextPaths); final DOMRpcImplementationRegistration domReg = domRpcRegistry.registerRpcImplementation(adapter, domRpcs); return new BindingRpcAdapterRegistration<>(implementation, domReg); } - private Set createDomRpcIdentifiers(final Class type, final Set paths) { - final Set rpcs = getRpcSchemaPaths(type); - + private static Set createDomRpcIdentifiers(final Set rpcs, final Collection paths) { final Set ret = new HashSet<>(); - for(final YangInstanceIdentifier path : paths) { - for(final SchemaPath rpc : rpcs) { + for (final YangInstanceIdentifier path : paths) { + for (final SchemaPath rpc : rpcs) { ret.add(DOMRpcIdentifier.create(rpc, path)); } } return ret; } - private Set toYangInstanceIdentifiers(final Set> identifiers) { - final Set ret = new HashSet<>(); - for(final InstanceIdentifier binding: identifiers) { - ret.add(codec.toNormalized(binding)); + private Collection toYangInstanceIdentifiers(final Set> identifiers) { + final Collection ret = new ArrayList<>(identifiers.size()); + for (final InstanceIdentifier binding : identifiers) { + ret.add(codec.toYangInstanceIdentifierCached(binding)); } return ret; } - - private Set getRpcSchemaPaths(final Class type) { - return codec.getRpcMethodToSchemaPath(type).values(); - } - }