* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.mdsal.binding.dom.adapter;
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
+import static java.util.Objects.requireNonNull;
+import static org.opendaylight.mdsal.binding.dom.adapter.StaticConfiguration.ENABLE_CODEC_SHORTCUT;
+
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.Futures;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import java.util.Collection;
import java.util.Map.Entry;
+import java.util.Optional;
import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry;
+import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections;
import org.opendaylight.mdsal.dom.api.DOMRpcResult;
import org.opendaylight.mdsal.dom.api.DOMRpcService;
import org.opendaylight.mdsal.dom.spi.RpcRoutingStrategy;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.RpcService;
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.RpcError;
-import org.opendaylight.yangtools.yang.common.RpcError.ErrorSeverity;
import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.YangConstants;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.model.api.SchemaPath;
class RpcServiceAdapter implements InvocationHandler {
-
private final ImmutableMap<Method, RpcInvocationStrategy> rpcNames;
private final Class<? extends RpcService> type;
private final BindingToNormalizedNodeCodec codec;
RpcServiceAdapter(final Class<? extends RpcService> type, final BindingToNormalizedNodeCodec codec,
final DOMRpcService domService) {
- this.type = Preconditions.checkNotNull(type);
- this.codec = Preconditions.checkNotNull(codec);
- this.delegate = Preconditions.checkNotNull(domService);
+ this.type = requireNonNull(type);
+ this.codec = requireNonNull(codec);
+ this.delegate = requireNonNull(domService);
final ImmutableMap.Builder<Method, RpcInvocationStrategy> rpcBuilder = ImmutableMap.builder();
for (final Entry<Method, RpcDefinition> rpc : codec.getRpcMethodToSchema(type).entrySet()) {
rpcBuilder.put(rpc.getKey(), createStrategy(rpc.getKey(), rpc.getValue()));
final RpcInvocationStrategy rpc = rpcNames.get(method);
if (rpc != null) {
- if (method.getParameterTypes().length == 0) {
+ if (method.getParameterCount() == 0) {
return rpc.invokeEmpty();
}
if (args.length != 1) {
return rpc.invoke((DataObject) args[0]);
}
- if (isObjectMethod(method)) {
- return callObjectMethod(proxy, method, args);
- }
- throw new UnsupportedOperationException("Method " + method.toString() + "is unsupported.");
- }
-
- private static boolean isObjectMethod(final Method method) {
switch (method.getName()) {
case "toString":
- return method.getReturnType().equals(String.class) && method.getParameterTypes().length == 0;
+ if (method.getReturnType().equals(String.class) && method.getParameterCount() == 0) {
+ return type.getName() + "$Adapter{delegate=" + delegate.toString() + "}";
+ }
+ break;
case "hashCode":
- return method.getReturnType().equals(int.class) && method.getParameterTypes().length == 0;
+ if (method.getReturnType().equals(int.class) && method.getParameterCount() == 0) {
+ return System.identityHashCode(proxy);
+ }
+ break;
case "equals":
- return method.getReturnType().equals(boolean.class) && method.getParameterTypes().length == 1
- && method.getParameterTypes()[0] == Object.class;
+ if (method.getReturnType().equals(boolean.class) && method.getParameterCount() == 1
+ && method.getParameterTypes()[0] == Object.class) {
+ return proxy == args[0];
+ }
+ break;
default:
- return false;
+ break;
}
- }
- private Object callObjectMethod(final Object self, final Method method, final Object[] args) {
- switch (method.getName()) {
- case "toString":
- return type.getName() + "$Adapter{delegate=" + delegate.toString() + "}";
- case "hashCode":
- return System.identityHashCode(self);
- case "equals":
- return self == args[0];
- default:
- return null;
- }
+ throw new UnsupportedOperationException("Method " + method.toString() + "is unsupported.");
}
private abstract class RpcInvocationStrategy {
return invoke0(rpcName, serialize(input));
}
- abstract NormalizedNode<?, ?> serialize(DataObject input);
+ abstract ContainerNode serialize(DataObject input);
final ListenableFuture<RpcResult<?>> invokeEmpty() {
return invoke0(rpcName, null);
return rpcName;
}
- private ListenableFuture<RpcResult<?>> invoke0(final SchemaPath schemaPath, final NormalizedNode<?, ?> input) {
+ ListenableFuture<RpcResult<?>> invoke0(final SchemaPath schemaPath, final ContainerNode input) {
final ListenableFuture<DOMRpcResult> result = delegate.invokeRpc(schemaPath, input);
- if (result instanceof LazyDOMRpcResultFuture) {
- return ((LazyDOMRpcResultFuture) result).getBindingFuture();
+ if (ENABLE_CODEC_SHORTCUT && result instanceof BindingRpcFutureAware) {
+ return ((BindingRpcFutureAware) result).getBindingFuture();
}
return transformFuture(schemaPath, result, codec.getCodecFactory());
private ListenableFuture<RpcResult<?>> transformFuture(final SchemaPath rpc,
final ListenableFuture<DOMRpcResult> domFuture, final BindingNormalizedNodeCodecRegistry resultCodec) {
- return Futures.transform(domFuture, (Function<DOMRpcResult, RpcResult<?>>) input -> {
+ return Futures.transform(domFuture, input -> {
final NormalizedNode<?, ?> domData = input.getResult();
final DataObject bindingResult;
if (domData != null) {
- final SchemaPath rpcOutput = rpc.createChild(QName.create(rpc.getLastComponent(), "output"));
+ final SchemaPath rpcOutput = rpc.createChild(YangConstants.operationOutputQName(
+ rpc.getLastComponent().getModule()));
bindingResult = resultCodec.fromNormalizedNodeRpcData(rpcOutput, (ContainerNode) domData);
} else {
bindingResult = null;
}
- // DOMRpcResult does not have a notion of success, hence we have to reverse-engineer it by looking
- // at reported errors and checking whether they are just warnings.
- final Collection<RpcError> errors = input.getErrors();
- return RpcResult.class.cast(RpcResultBuilder.status(errors.stream()
- .noneMatch(error -> error.getSeverity() == ErrorSeverity.ERROR))
- .withResult(bindingResult).withRpcErrors(errors).build());
+ return RpcResultUtil.rpcResultFromDOM(input.getErrors(), bindingResult);
}, MoreExecutors.directExecutor());
}
}
}
@Override
- NormalizedNode<?, ?> serialize(final DataObject input) {
+ ContainerNode serialize(final DataObject input) {
return LazySerializedContainerNode.create(getRpcName(), input, codec.getCodecRegistry());
}
}
@Override
- NormalizedNode<?, ?> serialize(final DataObject input) {
+ ContainerNode serialize(final DataObject input) {
final InstanceIdentifier<?> bindingII = refExtractor.extract(input);
if (bindingII != null) {
final YangInstanceIdentifier yangII = codec.toYangInstanceIdentifierCached(bindingII);
Code Review / mdsal.git / blobdiff