* 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 org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
+import static java.util.Objects.requireNonNull;
-import org.opendaylight.mdsal.dom.api.DOMRpcException;
-import org.opendaylight.mdsal.dom.api.DOMRpcResult;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
-import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.AbstractFuture;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.mdsal.dom.api.DOMRpcException;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
+import org.opendaylight.mdsal.dom.api.DefaultDOMRpcException;
+import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
+import org.opendaylight.yangtools.util.concurrent.ExceptionMapper;
import org.opendaylight.yangtools.yang.binding.DataContainer;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-final class LazyDOMRpcResultFuture implements CheckedFuture<DOMRpcResult, DOMRpcException> {
+final class LazyDOMRpcResultFuture extends AbstractFuture<DOMRpcResult> implements BindingRpcFutureAware {
+ private static final ExceptionMapper<DOMRpcException> DOM_RPC_EX_MAPPER = new ExceptionMapper<>("rpc",
+ DOMRpcException.class) {
+ @Override
+ protected DOMRpcException newWithCause(final String message, final Throwable cause) {
+ return cause instanceof DOMRpcException ? (DOMRpcException)cause
+ : new DefaultDOMRpcException("RPC failed", cause);
+ }
+ };
private final ListenableFuture<RpcResult<?>> bindingFuture;
- private final BindingNormalizedNodeCodecRegistry codec;
+ private final BindingNormalizedNodeSerializer codec;
private volatile DOMRpcResult result;
private LazyDOMRpcResultFuture(final ListenableFuture<RpcResult<?>> delegate,
- final BindingNormalizedNodeCodecRegistry codec) {
- this.bindingFuture = Preconditions.checkNotNull(delegate, "delegate");
- this.codec = Preconditions.checkNotNull(codec, "codec");
+ final BindingNormalizedNodeSerializer codec) {
+ this.bindingFuture = requireNonNull(delegate, "delegate");
+ this.codec = requireNonNull(codec, "codec");
}
- static CheckedFuture<DOMRpcResult, DOMRpcException> create(final BindingNormalizedNodeCodecRegistry codec,
+ static @NonNull LazyDOMRpcResultFuture create(final BindingNormalizedNodeSerializer codec,
final ListenableFuture<RpcResult<?>> bindingResult) {
return new LazyDOMRpcResultFuture(bindingResult, codec);
}
- ListenableFuture<RpcResult<?>> getBindingFuture() {
+ @Override
+ public ListenableFuture<RpcResult<?>> getBindingFuture() {
return bindingFuture;
}
if (result != null) {
return result;
}
- return transformIfNecessary(bindingFuture.get());
+
+ try {
+ return transformIfNecessary(bindingFuture.get());
+ } catch (ExecutionException e) {
+ throw new ExecutionException(e.getMessage(), DOM_RPC_EX_MAPPER.apply(e));
+ }
}
@Override
if (result != null) {
return result;
}
- return transformIfNecessary(bindingFuture.get(timeout, unit));
- }
-
- @Override
- public DOMRpcResult checkedGet() throws DOMRpcException {
- try {
- return get();
- } catch (InterruptedException | ExecutionException e) {
- // FIXME: Add exception mapping
- throw Throwables.propagate(e);
- }
- }
- @Override
- public DOMRpcResult checkedGet(final long timeout, final TimeUnit unit) throws TimeoutException, DOMRpcException {
try {
- return get(timeout, unit);
- } catch (InterruptedException | ExecutionException e) {
- // FIXME: Add exception mapping
- throw Throwables.propagate(e);
+ return transformIfNecessary(bindingFuture.get(timeout, unit));
+ } catch (ExecutionException e) {
+ throw new ExecutionException(e.getMessage(), DOM_RPC_EX_MAPPER.apply(e));
}
}
final Object inputData = input.getResult();
if (inputData instanceof DataContainer) {
return new DefaultDOMRpcResult(codec.toNormalizedNodeRpcData((DataContainer) inputData));
- } else {
- return new DefaultDOMRpcResult((NormalizedNode<?, ?>) null);
}
+
+ return new DefaultDOMRpcResult((NormalizedNode) null);
}
return new DefaultDOMRpcResult(input.getErrors());
}
-
}