import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.function.Function;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueue;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
import org.opendaylight.openflowplugin.impl.services.util.ServiceException;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
import org.opendaylight.yangtools.yang.binding.DataContainer;
-import org.opendaylight.yangtools.yang.common.RpcError;
+import org.opendaylight.yangtools.yang.common.ErrorTag;
+import org.opendaylight.yangtools.yang.common.ErrorType;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.opendaylight.yangtools.yang.common.Uint64;
+import org.opendaylight.yangtools.yang.common.Uint8;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class AbstractService<I, O> {
private static final Logger LOG = LoggerFactory.getLogger(AbstractService.class);
- private final short version;
+ private final Uint8 version;
private final Uint64 datapathId;
private final RequestContextStack requestContextStack;
private final DeviceContext deviceContext;
this.eventIdentifier = eventIdentifier;
}
- public short getVersion() {
+ public final Uint8 getVersion() {
return version;
}
- public Uint64 getDatapathId() {
+ public final Uint64 getDatapathId() {
return datapathId;
}
protected abstract FutureCallback<OfHeader> createCallback(RequestContext<O> context, Class<?> requestType);
- public ListenableFuture<RpcResult<O>> handleServiceCall(@Nonnull final I input) {
+ public ListenableFuture<RpcResult<O>> handleServiceCall(@NonNull final I input) {
return handleServiceCall(input, null);
}
- public ListenableFuture<RpcResult<O>> handleServiceCall(@Nonnull final I input,
+ public ListenableFuture<RpcResult<O>> handleServiceCall(@NonNull final I input,
@Nullable final Function<OfHeader, Boolean> isComplete) {
Preconditions.checkNotNull(input);
getMessageSpy().spyMessage(AbstractService.class, MessageSpy.StatisticsGroup.TO_SWITCH_DISREGARDED);
return Futures.immediateFuture(RpcResultBuilder
.<O>failed()
- .withError(RpcError.ErrorType.APPLICATION, "", "Request quota exceeded")
+ .withError(ErrorType.APPLICATION, ErrorTag.ACCESS_DENIED, "Request quota exceeded")
.build());
}
final OutboundQueue outboundQueue =
getDeviceContext().getPrimaryConnectionContext().getOutboundQueueProvider();
- // FIXME: reconcile uint32 vs. Long overflows
- final Long queueXid = xid.getValue().toJava();
+ final Uint32 queueXid = xid.getValue();
if (isComplete != null) {
outboundQueue.commitEntry(queueXid, request, createCallback(requestContext, requestType), isComplete);
} else {