-/**
+/*
* Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
import io.netty.util.HashedWheelTimer;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey;
private final HashedWheelTimer hashedWheelTimer;
private final DeviceState deviceState;
private final DataBroker dataBroker;
- private final Collection<RequestContext<?>> requestContexts = new HashSet<>();
+ private final Collection<RequestContext<?>> requestContexts = ConcurrentHashMap.newKeySet();
private final MessageSpy messageSpy;
private final MessageTranslator<PortGrouping, FlowCapableNodeConnector> portStatusTranslator;
private final MessageTranslator<PacketInMessage, PacketReceived> packetInTranslator;
}
@Override
- public ReadOnlyTransaction getReadTransaction() {
+ public ReadTransaction getReadTransaction() {
return dataBroker.newReadOnlyTransaction();
}
OpenflowVersion.get(deviceInfo.getVersion()))));
writeToTransaction(LogicalDatastoreType.OPERATIONAL, iiToNodeConnector, new NodeConnectorBuilder()
- .setKey(iiToNodeConnector.getKey())
+ .withKey(iiToNodeConnector.getKey())
.addAugmentation(FlowCapableNodeConnectorStatisticsData.class, new
FlowCapableNodeConnectorStatisticsDataBuilder().build())
.addAugmentation(FlowCapableNodeConnector.class, flowCapableNodeConnector)
if (Objects.nonNull(implementedInterface) && org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service
.rev130709.PacketInMessage.class.equals(implementedInterface)) {
final org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709
- .PacketInMessage packetInMessage = org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service
- .rev130709.PacketInMessage.class.cast(message);
+ .PacketInMessage packetInMessage = (org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service
+ .rev130709.PacketInMessage) message;
handlePacketInMessage(packetInMessage, implementedInterface, packetInMessage.getMatch());
return true;
}
@Override
- public ListenableFuture<Void> closeServiceInstance() {
- final ListenableFuture<Void> listenableFuture = initialized.get()
+ public ListenableFuture<?> closeServiceInstance() {
+ final ListenableFuture<?> listenableFuture = initialized.get()
? transactionChainManager.deactivateTransactionManager()
: Futures.immediateFuture(null);
deviceFlowRegistry.close();
deviceMeterRegistry.close();
- final ListenableFuture<Void> txChainShuttingDown = transactionChainManager.shuttingDown();
+ final ListenableFuture<?> txChainShuttingDown = transactionChainManager.shuttingDown();
- Futures.addCallback(txChainShuttingDown, new FutureCallback<Void>() {
+ Futures.addCallback(txChainShuttingDown, new FutureCallback<Object>() {
@Override
- public void onSuccess(@Nullable final Void result) {
+ public void onSuccess(final Object result) {
transactionChainManager.close();
transactionChainManager = null;
}
deviceInfo.toString()));
}
- final ListenableFuture<List<com.google.common.base.Optional<FlowCapableNode>>> deviceFlowRegistryFill =
+ final ListenableFuture<List<Optional<FlowCapableNode>>> deviceFlowRegistryFill =
getDeviceFlowRegistry().fill();
Futures.addCallback(deviceFlowRegistryFill,
new DeviceFlowRegistryCallback(deviceFlowRegistryFill, contextChainMastershipWatcher),
hasState.set(true);
}
- private class DeviceFlowRegistryCallback implements FutureCallback<List<com.google.common.base
- .Optional<FlowCapableNode>>> {
- private final ListenableFuture<List<com.google.common.base.Optional<FlowCapableNode>>> deviceFlowRegistryFill;
+ private class DeviceFlowRegistryCallback implements FutureCallback<List<Optional<FlowCapableNode>>> {
+ private final ListenableFuture<List<Optional<FlowCapableNode>>> deviceFlowRegistryFill;
private final ContextChainMastershipWatcher contextChainMastershipWatcher;
DeviceFlowRegistryCallback(
- ListenableFuture<List<com.google.common.base.Optional<FlowCapableNode>>> deviceFlowRegistryFill,
+ ListenableFuture<List<Optional<FlowCapableNode>>> deviceFlowRegistryFill,
ContextChainMastershipWatcher contextChainMastershipWatcher) {
this.deviceFlowRegistryFill = deviceFlowRegistryFill;
this.contextChainMastershipWatcher = contextChainMastershipWatcher;
}
@Override
- public void onSuccess(@Nullable List<com.google.common.base.Optional<FlowCapableNode>> result) {
+ public void onSuccess(@Nullable List<Optional<FlowCapableNode>> result) {
if (LOG.isDebugEnabled()) {
// Count all flows we read from datastore for debugging purposes.
// This number do not always represent how many flows were actually added
.stream()
.flatMap(Collection::stream)
.filter(Objects::nonNull)
- .flatMap(flowCapableNodeOptional -> flowCapableNodeOptional.asSet().stream())
+ .flatMap(flowCapableNodeOptional
+ -> com.google.common.base.Optional.fromJavaUtil(flowCapableNodeOptional).asSet().stream())
.filter(Objects::nonNull)
.filter(flowCapableNode -> Objects.nonNull(flowCapableNode.getTable()))
.flatMap(flowCapableNode -> flowCapableNode.getTable().stream())
LOG.debug("Cancelled filling flow registry with flows for node: {}", deviceInfo);
}
} else {
- LOG.warn("Failed filling flow registry with flows for node: {} with exception: {}", deviceInfo,
- throwable);
+ LOG.warn("Failed filling flow registry with flows for node: {}", deviceInfo, throwable);
}
contextChainMastershipWatcher.onNotAbleToStartMastership(
deviceInfo,